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

Uvs ready to be merge #26

Merged
merged 22 commits into from
Dec 3, 2014
Merged

Uvs ready to be merge #26

merged 22 commits into from
Dec 3, 2014

Conversation

patriciogonzalezvivo
Copy link
Contributor

No description provided.

}else{
_pts = sV;
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Patricio could you check through your files and make sure they all have newlines at the end? It's kind of a dumb rule but unix tools like 'cat' expect them to be there and can behave a little weirdly if they're not.

patriciogonzalezvivo and others added 6 commits December 1, 2014 15:43
-The polyline tesselation algorithm was duplicated in several functions, now all polyline building functions call a single generalized building function
-Renamed buildDynamicPolyline and related variables to buildScalablePolyline, to better reflect usage
@matteblair
Copy link
Member

Almost ready to merge this one, few things:

  • This branch uses uv coords as colors to show that the uvs work, but we probably don't want the master branch to look like that :)
  • We should add documentation to all of the functions we're adding, while they're relatively fresh in our minds. I'll add documentation to geometryHandler.h since I was just working on that today.
  • I'd like to go through the geometry files here and make sure we're not adding anything we don't need (e.g. convex hull, perhaps)
  • I'm strongly considering renaming "geometryHandler" to "builders" since we now have another "geometry" file (I think this also resembles the nomenclature in tangram-js)

@bcamper
Copy link
Member

bcamper commented Dec 2, 2014

Yes we use the 'builder' terminology in JS. Not really married to that either, though "geometry handler" seems pretty generic.

@bcamper
Copy link
Member

bcamper commented Dec 2, 2014

+1 to only include geometry functions we currently need, we can add them later as we have a use (convex hull etc)

float lerpValue(const float &_start, const float &_stop, float const &_amt);

// Scale a vector by a pct (0.0-1.0) of it lenght
void scale(glm::vec3 &_vec, float _length);
Copy link
Member

Choose a reason for hiding this comment

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

I think scale is a misleading name here, if I understand it correctly this function actually just sets the length of the input vector to _length. How about renaming it setLength ?

public:

Rectangle();
Rectangle(const glm::vec4 &_vec4);
Copy link
Member

Choose a reason for hiding this comment

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

Our style in this repo has been to declare references like glm::vec4& _vec4 instead of glm::vec4 &_vec4, please use this rule from now on

@matteblair
Copy link
Member

@patriciogonzalezvivo I've left a number of comments here about style and documentation and also revised geom.h to give you an example of the documentation style. When you've addressed all the comments here let me know and I'll see about merging this.

matteblair added a commit that referenced this pull request Dec 3, 2014
@matteblair matteblair merged commit ab6cd50 into master Dec 3, 2014
@tallytalwar tallytalwar deleted the uvs branch December 4, 2014 15:24
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