Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tile management #13

Merged
merged 153 commits into from
Oct 28, 2014
Merged

Tile management #13

merged 153 commits into from
Oct 28, 2014

Conversation

tallytalwar
Copy link
Member

Request for a Pull Request to integrate major functionalities in the master.

This implements:

  1. Style Abstract Class along with a PolygonStyle implementation.
    The style constructs the vboMesh and adds these meshes to respective tile. These tiles owns a data structure which maps style to vboMesh.
  2. tileManager functionalities of generating visible tile sets based on viewModule.
    TileManager now populates the tiles to be read from the dataSource. It is also responsible to call the respective styles to fill meshes for individual tiles.
  3. Implementation of scenedirector owning the control of the application.
  4. Implementation of GeometryHandler to get tesselated points, indices and normals.
  5. Implementation of JsonExtractor to extract coordinates from Json features.

tallytalwar and others added 30 commits September 29, 2014 09:47
…ut and drawMode. These are used in style to set vertex layout and drawMode for the vboMesh
… style, using glm methods and libtess2 tesselator. Inspired from Matt work for bgfx prototype
…ut and drawMode. These are used in style to set vertex layout and drawMode for the vboMesh
…for now, needs to be synchronized with style implementation
…this nomenclature needs to be updated in other places too); Change glm types to double precision where appropriate; Map tile geometry to style name strings instead of style objects to prevent excess copies
…ty class. Style Also contains a new member which has the layer and color mapping
…this to add const to all the member functions
…ts polygonAddData method and holds the tesselator object. TODO: implement other geometry processing methods to this.
TileID MapzenVectorTileJson::extractIDFromUrl(const std::string& _url) {
int xVal, yVal, zVal;

regObj.assign("([a-z\\./:]+)/(\\d+)/(\\d+)/(\\d+)([a-z\\.]+)");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blair1618 you can check this here (obviously will not be there with the previous commit) :D

matteblair and others added 7 commits October 23, 2014 18:29
- rename core/include/json to core/include/jsoncpp and update references in CMake files
- add libtess2 linking to OS X and iOS builds

Note: Android build still not working through CMake, may need to modify the toolchain ourselves :\

Conflicts:
	Makefile
	core/src/sceneDirector/sceneDirector.h
	core/src/tangramNativeApp.cpp
	core/src/viewModule/viewModule.h
	ios/TangramiOS/TangramiOS.xcodeproj/project.pbxproj
	ios/resources/Main_iPhone.storyboard
@tallytalwar
Copy link
Member Author

Thanks @karimnaaji and @blair1618. Moved precompiled static libs to respective platform precompiled dirs.

tallytalwar added a commit that referenced this pull request Oct 28, 2014
Tile management merged to master (finally)
@tallytalwar tallytalwar merged commit c97cdd6 into master Oct 28, 2014
@bcamper bcamper deleted the tile-management branch October 29, 2014 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants