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.

Sign up for GitHub

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

Added support for model color, colorBlendMode, and colorBlendAmount #122

Merged
merged 11 commits into from
Dec 6, 2016
Merged

Added support for model color, colorBlendMode, and colorBlendAmount #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c09f674
Added support for model color, colorBlendMode, and colorBlendAmount
lilleyse Dec 6, 2016
431af71
Fix Schema references in solution.
shunter Dec 6, 2016
76c8154
Replace markdown backticks when generating C# doc.
shunter Dec 6, 2016
20d83df
Fix up schema.
shunter Dec 6, 2016
4285832
Regenerate.
shunter Dec 6, 2016
9fa7a4d
Add new classes.
shunter Dec 6, 2016
c236fe6
Add tests.
shunter Dec 6, 2016
d52501b
Regenerate validation document.
shunter Dec 6, 2016
2624e24
Update compatibility classes to match current translator.
shunter Dec 6, 2016
10bca37
Retranslate Java.
shunter Dec 6, 2016
295e22a
Update project settings.
shunter Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
226 changes: 140 additions & 86 deletions DotNet/CesiumLanguageWriter.sln
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions DotNet/CesiumLanguageWriter/Advanced/CesiumFormattingHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,26 @@ public static string CornerTypeToString(CesiumCornerType value)
}
}

/// <summary>
/// Converts a <see cref="CesiumColorBlendMode"/> to the corresponding string in a CZML stream.
/// </summary>
/// <param name="value">The value to convert.</param>
/// <returns>The string representing the specified value.</returns>
public static string ColorBlendModeToString(CesiumColorBlendMode value)
{
switch (value)
{
case CesiumColorBlendMode.Highlight:
return "HIGHLIGHT";
case CesiumColorBlendMode.Replace:
return "REPLACE";
case CesiumColorBlendMode.Mix:
return "MIX";
default:
throw new ArgumentException(CesiumLocalization.UnknownEnumerationValue, "value");
}
}

/// <summary>
/// Converts a <see cref="CesiumSensorVolumePortionToDisplay"/> to the corresponding string in a CZML stream.
/// </summary>
Expand Down
23 changes: 23 additions & 0 deletions DotNet/CesiumLanguageWriter/CesiumColorBlendMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
namespace CesiumLanguageWriter
{
/// <summary>
/// The mode to use when blending between a target color and an entity's source color.
/// </summary>
public enum CesiumColorBlendMode
{
/// <summary>
/// Multiplies the source color by the target color.
/// </summary>
Highlight,

/// <summary>
/// Replaces the source color with the target color.
/// </summary>
Replace,

/// <summary>
/// Blends the source color and target color together.
/// </summary>
Mix,
}
}
272 changes: 205 additions & 67 deletions DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<Compile Include="Cartesian.cs" />
<Compile Include="Cartographic.cs" />
<Compile Include="CartographicExtent.cs" />
<Compile Include="CesiumColorBlendMode.cs" />
<Compile Include="CesiumCornerType.cs" />
<Compile Include="CesiumHeightReference.cs" />
<Compile Include="CesiumSensorVolumePortionToDisplay.cs" />
Expand All @@ -92,73 +93,210 @@
<Compile Include="ClockRange.cs" />
<Compile Include="ClockStep.cs" />
<Compile Include="CustomCesiumWriter.cs" />
<Compile Include="Generated\AlignedAxisCesiumWriter.cs" />
<Compile Include="Generated\BillboardCesiumWriter.cs" />
<Compile Include="Generated\BooleanCesiumWriter.cs" />
<Compile Include="Generated\BoundingRectangleCesiumWriter.cs" />
<Compile Include="Generated\BoxCesiumWriter.cs" />
<Compile Include="Generated\BoxDimensionsCesiumWriter.cs" />
<Compile Include="Generated\ClockCesiumWriter.cs" />
<Compile Include="Generated\ColorCesiumWriter.cs" />
<Compile Include="Generated\ConicSensorCesiumWriter.cs" />
<Compile Include="Generated\CornerTypeCesiumWriter.cs" />
<Compile Include="Generated\CorridorCesiumWriter.cs" />
<Compile Include="Generated\CustomPatternSensorCesiumWriter.cs" />
<Compile Include="Generated\CylinderCesiumWriter.cs" />
<Compile Include="Generated\DirectionCesiumWriter.cs" />
<Compile Include="Generated\DirectionListCesiumWriter.cs" />
<Compile Include="Generated\DoubleCesiumWriter.cs" />
<Compile Include="Generated\DoubleListCesiumWriter.cs" />
<Compile Include="Generated\EllipseCesiumWriter.cs" />
<Compile Include="Generated\EllipsoidCesiumWriter.cs" />
<Compile Include="Generated\EllipsoidRadiiCesiumWriter.cs" />
<Compile Include="Generated\EyeOffsetCesiumWriter.cs" />
<Compile Include="Generated\FanCesiumWriter.cs" />
<Compile Include="Generated\FontCesiumWriter.cs" />
<Compile Include="Generated\GridMaterialCesiumWriter.cs" />
<Compile Include="Generated\HeightReferenceCesiumWriter.cs" />
<Compile Include="Generated\HorizontalOriginCesiumWriter.cs" />
<Compile Include="Generated\ImageMaterialCesiumWriter.cs" />
<Compile Include="Generated\LabelCesiumWriter.cs" />
<Compile Include="Generated\LabelStyleCesiumWriter.cs" />
<Compile Include="Generated\LineCountCesiumWriter.cs" />
<Compile Include="Generated\LineOffsetCesiumWriter.cs" />
<Compile Include="Generated\LineThicknessCesiumWriter.cs" />
<Compile Include="Generated\MaterialCesiumWriter.cs" />
<Compile Include="Generated\ModelCesiumWriter.cs" />
<Compile Include="Generated\NearFarScalarCesiumWriter.cs" />
<Compile Include="Generated\NodeTransformationCesiumWriter.cs" />
<Compile Include="Generated\NodeTransformationsCesiumWriter.cs" />
<Compile Include="Generated\OrientationCesiumWriter.cs" />
<Compile Include="Generated\PacketCesiumWriter.cs" />
<Compile Include="Generated\PathCesiumWriter.cs" />
<Compile Include="Generated\PixelOffsetCesiumWriter.cs" />
<Compile Include="Generated\PointCesiumWriter.cs" />
<Compile Include="Generated\PolygonCesiumWriter.cs" />
<Compile Include="Generated\PolylineArrowMaterialCesiumWriter.cs" />
<Compile Include="Generated\PolylineCesiumWriter.cs" />
<Compile Include="Generated\PolylineGlowMaterialCesiumWriter.cs" />
<Compile Include="Generated\PolylineMaterialCesiumWriter.cs" />
<Compile Include="Generated\PolylineOutlineMaterialCesiumWriter.cs" />
<Compile Include="Generated\PositionCesiumWriter.cs" />
<Compile Include="Generated\PositionListCesiumWriter.cs" />
<Compile Include="Generated\RectangleCesiumWriter.cs" />
<Compile Include="Generated\RectangleCoordinatesCesiumWriter.cs" />
<Compile Include="Generated\RectangularSensorCesiumWriter.cs" />
<Compile Include="Generated\RepeatCesiumWriter.cs" />
<Compile Include="Generated\RotationCesiumWriter.cs" />
<Compile Include="Generated\ScaleCesiumWriter.cs" />
<Compile Include="Generated\SensorVolumePortionToDisplayCesiumWriter.cs" />
<Compile Include="Generated\SolidColorMaterialCesiumWriter.cs" />
<Compile Include="Generated\StringCesiumWriter.cs" />
<Compile Include="Generated\StripeMaterialCesiumWriter.cs" />
<Compile Include="Generated\StripeOrientationCesiumWriter.cs" />
<Compile Include="Generated\TranslationCesiumWriter.cs" />
<Compile Include="Generated\UriCesiumWriter.cs" />
<Compile Include="Generated\VectorCesiumWriter.cs" />
<Compile Include="Generated\VerticalOriginCesiumWriter.cs" />
<Compile Include="Generated\ViewFromCesiumWriter.cs" />
<Compile Include="Generated\WallCesiumWriter.cs" />
<Compile Include="Generated\AlignedAxisCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\BillboardCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\BooleanCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\BoundingRectangleCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\BoxCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\BoxDimensionsCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ClockCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ColorBlendModeCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ColorCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ConicSensorCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\CornerTypeCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\CorridorCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\CustomPatternSensorCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\CylinderCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\DirectionCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\DirectionListCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\DoubleCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\DoubleListCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\EllipseCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\EllipsoidCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\EllipsoidRadiiCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\EyeOffsetCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\FanCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\FontCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\GridMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\HeightReferenceCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\HorizontalOriginCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ImageMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\LabelCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\LabelStyleCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\LineCountCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\LineOffsetCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\LineThicknessCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\MaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ModelCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\NearFarScalarCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\NodeTransformationCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\NodeTransformationsCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\OrientationCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PacketCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PathCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PixelOffsetCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PointCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PolygonCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PolylineArrowMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PolylineCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PolylineGlowMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PolylineMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PolylineOutlineMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PositionCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\PositionListCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\RectangleCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\RectangleCoordinatesCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\RectangularSensorCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\RepeatCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\RotationCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ScaleCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\SensorVolumePortionToDisplayCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\SolidColorMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\StringCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\StripeMaterialCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\StripeOrientationCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\TranslationCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\UriCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\VectorCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\VerticalOriginCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\ViewFromCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Generated\WallCesiumWriter.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="grisu\DiyFp.cs" />
<Compile Include="grisu\Grisu.cs" />
<Compile Include="grisu\GrisuDouble.cs" />
Expand Down
Loading