Merge pull request #184 from AnalyticalGraphicsInc/sensorViewshed

Add sensor viewshed properties.
AnalyticalGraphicsInc · Mar 1, 2021 · 76356a2 · 76356a2
2 parents bc8a4f2 + 72abd78
commit 76356a2
Show file tree

Hide file tree

Showing 11 changed files with 4,876 additions and 45 deletions.
diff --git a/DotNet/CesiumLanguageWriter/Generated/ConicSensorCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/ConicSensorCesiumWriter.cs
diff --git a/DotNet/CesiumLanguageWriter/Generated/CustomPatternSensorCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/CustomPatternSensorCesiumWriter.cs
diff --git a/DotNet/CesiumLanguageWriter/Generated/RectangularSensorCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/RectangularSensorCesiumWriter.cs
diff --git a/DotNet/CesiumLanguageWriterTests/TestGenerateValidationDocument.cs b/DotNet/CesiumLanguageWriterTests/TestGenerateValidationDocument.cs
diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/ConicSensorCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/ConicSensorCesiumWriter.java
diff --git a/...iumLanguageWriter/translatedSrc/cesiumlanguagewriter/CustomPatternSensorCesiumWriter.java b/...iumLanguageWriter/translatedSrc/cesiumlanguagewriter/CustomPatternSensorCesiumWriter.java
diff --git a/...esiumLanguageWriter/translatedSrc/cesiumlanguagewriter/RectangularSensorCesiumWriter.java b/...esiumLanguageWriter/translatedSrc/cesiumlanguagewriter/RectangularSensorCesiumWriter.java
diff --git a/...geWriterTests/translatedSrc/cesiumlanguagewritertests/TestGenerateValidationDocument.java b/...geWriterTests/translatedSrc/cesiumlanguagewritertests/TestGenerateValidationDocument.java
diff --git a/Schema/Extensions/AGI/ConicSensor.json b/Schema/Extensions/AGI/ConicSensor.json
@@ -98,7 +98,7 @@
         },
         "environmentConstraint": {
             "$ref": "../../Boolean.json",
-            "description": "Whether or not the sensor will intersect the environment, e.g. terrain or models.",
+            "description": "Whether or not the sensor will be occluded by objects in the current view of the environment, e.g. visible terrain or models.",
             "default": false
         },
         "showEnvironmentOcclusion": {
@@ -130,6 +130,26 @@
             "$ref": "../../Boolean.json",
             "description": "Whether or not a sensor intersecting the ellipsoid is drawn through the ellipsoid and potentially out to the other side.",
             "default": false
+        },
+        "showViewshed": {
+            "$ref": "../../Boolean.json",
+            "description": "Whether or not the viewshed of the sensor will be drawn.",
+            "default": false
+        },
+        "viewshedVisibleColor": {
+            "$ref": "../../Color.json",
+            "description": "The color of the scene geometry that is visible to the sensor.",
+            "default": "lime, 50% transparent"
+        },
+        "viewshedOccludedColor": {
+            "$ref": "../../Color.json",
+            "description": "The color of the scene geometry that is not visible to the sensor.",
+            "default": "red, 50% transparent"
+        },
+        "viewshedResolution": {
+            "$ref": "../../Double.json",
+            "description": "The resolution in pixels of the viewshed.",
+            "default": 2048
         }
     }
 }
diff --git a/Schema/Extensions/AGI/CustomPatternSensor.json b/Schema/Extensions/AGI/CustomPatternSensor.json
@@ -83,7 +83,7 @@
         },
         "environmentConstraint": {
             "$ref": "../../Boolean.json",
-            "description": "Whether or not the sensor will intersect the environment, e.g. terrain or models.",
+            "description": "Whether or not the sensor will be occluded by objects in the current view of the environment, e.g. visible terrain or models.",
             "default": false
         },
         "showEnvironmentOcclusion": {
@@ -115,6 +115,26 @@
             "$ref": "../../Boolean.json",
             "description": "Whether or not a sensor intersecting the ellipsoid is drawn through the ellipsoid and potentially out to the other side.",
             "default": false
+        },
+        "showViewshed": {
+            "$ref": "../../Boolean.json",
+            "description": "Whether or not the viewshed of the sensor will be drawn.",
+            "default": false
+        },
+        "viewshedVisibleColor": {
+            "$ref": "../../Color.json",
+            "description": "The color of the scene geometry that is visible to the sensor.",
+            "default": "lime, 50% transparent"
+        },
+        "viewshedOccludedColor": {
+            "$ref": "../../Color.json",
+            "description": "The color of the scene geometry that is not visible to the sensor.",
+            "default": "red, 50% transparent"
+        },
+        "viewshedResolution": {
+            "$ref": "../../Double.json",
+            "description": "The resolution in pixels of the viewshed.",
+            "default": 2048
         }
     }
 }
diff --git a/Schema/Extensions/AGI/RectangularSensor.json b/Schema/Extensions/AGI/RectangularSensor.json
@@ -88,7 +88,7 @@
         },
         "environmentConstraint": {
             "$ref": "../../Boolean.json",
-            "description": "Whether or not the sensor will intersect the environment, e.g. terrain or models.",
+            "description": "Whether or not the sensor will be occluded by objects in the current view of the environment, e.g. visible terrain or models.",
             "default": false
         },
         "showEnvironmentOcclusion": {
@@ -120,6 +120,26 @@
             "$ref": "../../Boolean.json",
             "description": "Whether or not a sensor intersecting the ellipsoid is drawn through the ellipsoid and potentially out to the other side.",
             "default": false
+        },
+        "showViewshed": {
+            "$ref": "../../Boolean.json",
+            "description": "Whether or not the viewshed of the sensor will be drawn.",
+            "default": false
+        },
+        "viewshedVisibleColor": {
+            "$ref": "../../Color.json",
+            "description": "The color of the scene geometry that is visible to the sensor.",
+            "default": "lime, 50% transparent"
+        },
+        "viewshedOccludedColor": {
+            "$ref": "../../Color.json",
+            "description": "The color of the scene geometry that is not visible to the sensor.",
+            "default": "red, 50% transparent"
+        },
+        "viewshedResolution": {
+            "$ref": "../../Double.json",
+            "description": "The resolution in pixels of the viewshed.",
+            "default": 2048
         }
     }
 }