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

Add support for stripe materials. #61

Merged
merged 6 commits into from
Apr 8, 2014
Merged

Add support for stripe materials. #61

merged 6 commits into from
Apr 8, 2014

Conversation

mramato
Copy link
Contributor

@mramato mramato commented Mar 14, 2014

This goes along with CesiumGS/cesium/pull/1556. This shouldn't be merged until that PR goes into Cesium master. I also haven't updated Java yet (since I expect further changes).

Rename lightColor/darkColor to evenColor/oddColor, replace horizontal boolean with enumeration.  Still needs some cleanup.
@mramato mramato changed the title Add support for strip materials. Add support for stripe materials. Mar 18, 2014
Conflicts:
	DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj
@mramato
Copy link
Contributor Author

mramato commented Mar 18, 2014

Okay, this is ready

@@ -0,0 +1,13 @@
{
"title": "StripeOrientation",
"description": "Defines the orientaiton of stripes in the stripe material.",
Copy link
Member

Choose a reason for hiding this comment

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

typo orientaiton.

@mramato
Copy link
Contributor Author

mramato commented Apr 6, 2014

This is ready.

shunter added a commit that referenced this pull request Apr 8, 2014
@shunter shunter merged commit 4cd52ed into master Apr 8, 2014
@shunter shunter deleted the stripeMaterial branch April 8, 2014 14:22
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.

2 participants