Merge pull request #102 from AnalyticalGraphicsInc/gbeatty-modelNodeT…

…ransform Model node transformations and other improvements
AnalyticalGraphicsInc · Dec 3, 2015 · 89a3992 · 89a3992
2 parents 2a65f9a + d2f07b2
commit 89a3992
Show file tree

Hide file tree

Showing 204 changed files with 9,433 additions and 1,384 deletions.
diff --git a/DotNet/CesiumLanguageWriter.sln b/DotNet/CesiumLanguageWriter.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CesiumLanguageWriter", "CesiumLanguageWriter\CesiumLanguageWriter.csproj", "{085359F8-CC1D-4561-94C7-0BF067B8E370}"
 EndProject
@@ -46,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schema", "Schema", "{04E49F
  ..\Schema\LineThickness.jsonschema = ..\Schema\LineThickness.jsonschema
  ..\Schema\Material.jsonschema = ..\Schema\Material.jsonschema
  ..\Schema\Model.jsonschema = ..\Schema\Model.jsonschema
+ ..\Schema\NodeTransformation.jsonschema = ..\Schema\NodeTransformation.jsonschema
+ ..\Schema\NodeTransformations.jsonschema = ..\Schema\NodeTransformations.jsonschema
  ..\Schema\Orientation.jsonschema = ..\Schema\Orientation.jsonschema
  ..\Schema\Packet.jsonschema = ..\Schema\Packet.jsonschema
  ..\Schema\Path.jsonschema = ..\Schema\Path.jsonschema
@@ -63,6 +65,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schema", "Schema", "{04E49F
  ..\Schema\Repeat.jsonschema = ..\Schema\Repeat.jsonschema
  ..\Schema\RgbafValue.jsonschema = ..\Schema\RgbafValue.jsonschema
  ..\Schema\RgbaValue.jsonschema = ..\Schema\RgbaValue.jsonschema
+ ..\Schema\Scale.jsonschema = ..\Schema\Scale.jsonschema
  ..\Schema\SolidColorMaterial.jsonschema = ..\Schema\SolidColorMaterial.jsonschema
  ..\Schema\SphericalListValue.jsonschema = ..\Schema\SphericalListValue.jsonschema
  ..\Schema\SphericalValue.jsonschema = ..\Schema\SphericalValue.jsonschema
@@ -72,7 +75,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schema", "Schema", "{04E49F
  ..\Schema\StripeOrientation.jsonschema = ..\Schema\StripeOrientation.jsonschema
  ..\Schema\StripeOrientationValue.jsonschema = ..\Schema\StripeOrientationValue.jsonschema
  ..\Schema\TimeIntervalCollectionValue.jsonschema = ..\Schema\TimeIntervalCollectionValue.jsonschema
+ ..\Schema\TimeIntervalValue.jsonschema = ..\Schema\TimeIntervalValue.jsonschema
  ..\Schema\TimeValue.jsonschema = ..\Schema\TimeValue.jsonschema
+ ..\Schema\Translation.jsonschema = ..\Schema\Translation.jsonschema
  ..\Schema\UnitCartesian3ListValue.jsonschema = ..\Schema\UnitCartesian3ListValue.jsonschema
  ..\Schema\UnitCartesian3Value.jsonschema = ..\Schema\UnitCartesian3Value.jsonschema
  ..\Schema\UnitQuaternionValue.jsonschema = ..\Schema\UnitQuaternionValue.jsonschema
@@ -89,6 +94,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateFromSchema", "Gener
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{5E4C0F36-35DC-4ED8-91EC-EAAC109836A0}"
  ProjectSection(SolutionItems) = preProject
+ ..\Schema\Examples\NodeTransformations.json = ..\Schema\Examples\NodeTransformations.json
  ..\Schema\Examples\SimplePosition.json = ..\Schema\Examples\SimplePosition.json
  ..\Schema\Examples\TimeVaryingPosition.json = ..\Schema\Examples\TimeVaryingPosition.json
  EndProjectSection

diff --git a/DotNet/CesiumLanguageWriter/Advanced/CesiumPropertyWriter.cs b/DotNet/CesiumLanguageWriter/Advanced/CesiumPropertyWriter.cs
@@ -91,8 +91,7 @@ public TDerived IntervalWriter
  /// <returns>The writer.</returns>
  public TDerived OpenInterval()
  {
- TDerived result = OpenAndReturn(m_interval.Value);
- return result;
+ return OpenAndReturn(m_interval.Value);
  }
 
  /// <summary>

diff --git a/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj b/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj
@@ -109,6 +109,8 @@
  <Compile Include="Generated\LineThicknessCesiumWriter.cs" />
  <Compile Include="Generated\MaterialCesiumWriter.cs" />
  <Compile Include="Generated\ModelCesiumWriter.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" />
@@ -123,11 +125,13 @@
  <Compile Include="Generated\PositionListCesiumWriter.cs" />
  <Compile Include="Generated\RectangularSensorCesiumWriter.cs" />
  <Compile Include="Generated\RepeatCesiumWriter.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" />

diff --git a/DotNet/CesiumLanguageWriter/Generated/AlignedAxisCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/AlignedAxisCesiumWriter.cs
@@ -149,8 +149,7 @@ public ICesiumInterpolatableValuePropertyWriter<Cartesian> AsCartesian()
 
  private ICesiumInterpolatableValuePropertyWriter<Cartesian> CreateCartesianAdaptor()
  {
- return new CesiumInterpolatableWriterAdaptor<AlignedAxisCesiumWriter, Cartesian>(
- this, (me, value) => me.WriteCartesian(value), (AlignedAxisCesiumWriter me, IList<JulianDate> dates, IList<Cartesian> values, int startIndex, int length) => me.WriteCartesian(dates, values, startIndex, length));
+ return new CesiumInterpolatableWriterAdaptor<AlignedAxisCesiumWriter, Cartesian>(this, (me, value) => me.WriteCartesian(value), (me, dates, values, startIndex, length) => me.WriteCartesian(dates, values, startIndex, length));
  }
 
  /// <summary>
@@ -164,8 +163,7 @@ public ICesiumValuePropertyWriter<Reference> AsReference()
 
  private ICesiumValuePropertyWriter<Reference> CreateReferenceAdaptor()
  {
- return new CesiumWriterAdaptor<AlignedAxisCesiumWriter, Reference>(
- this, (me, value) => me.WriteReference(value));
+ return new CesiumWriterAdaptor<AlignedAxisCesiumWriter, Reference>(this, (me, value) => me.WriteReference(value));
  }
 
  }