Skip to content

Commit 76356a2

Browse files
authored
Merge pull request #184 from AnalyticalGraphicsInc/sensorViewshed
Add sensor viewshed properties.
2 parents bc8a4f2 + 72abd78 commit 76356a2

File tree

11 files changed

+4876
-45
lines changed

11 files changed

+4876
-45
lines changed

DotNet/CesiumLanguageWriter/Generated/ConicSensorCesiumWriter.cs

+579-7
Large diffs are not rendered by default.

DotNet/CesiumLanguageWriter/Generated/CustomPatternSensorCesiumWriter.cs

+579-7
Large diffs are not rendered by default.

DotNet/CesiumLanguageWriter/Generated/RectangularSensorCesiumWriter.cs

+579-7
Large diffs are not rendered by default.

DotNet/CesiumLanguageWriterTests/TestGenerateValidationDocument.cs

+312
Large diffs are not rendered by default.

Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/ConicSensorCesiumWriter.java

+691-7
Large diffs are not rendered by default.

Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CustomPatternSensorCesiumWriter.java

+691-7
Large diffs are not rendered by default.

Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/RectangularSensorCesiumWriter.java

+691-7
Large diffs are not rendered by default.

Java/CesiumLanguageWriterTests/translatedSrc/cesiumlanguagewritertests/TestGenerateValidationDocument.java

+691
Large diffs are not rendered by default.

Schema/Extensions/AGI/ConicSensor.json

+21-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
},
9999
"environmentConstraint": {
100100
"$ref": "../../Boolean.json",
101-
"description": "Whether or not the sensor will intersect the environment, e.g. terrain or models.",
101+
"description": "Whether or not the sensor will be occluded by objects in the current view of the environment, e.g. visible terrain or models.",
102102
"default": false
103103
},
104104
"showEnvironmentOcclusion": {
@@ -130,6 +130,26 @@
130130
"$ref": "../../Boolean.json",
131131
"description": "Whether or not a sensor intersecting the ellipsoid is drawn through the ellipsoid and potentially out to the other side.",
132132
"default": false
133+
},
134+
"showViewshed": {
135+
"$ref": "../../Boolean.json",
136+
"description": "Whether or not the viewshed of the sensor will be drawn.",
137+
"default": false
138+
},
139+
"viewshedVisibleColor": {
140+
"$ref": "../../Color.json",
141+
"description": "The color of the scene geometry that is visible to the sensor.",
142+
"default": "lime, 50% transparent"
143+
},
144+
"viewshedOccludedColor": {
145+
"$ref": "../../Color.json",
146+
"description": "The color of the scene geometry that is not visible to the sensor.",
147+
"default": "red, 50% transparent"
148+
},
149+
"viewshedResolution": {
150+
"$ref": "../../Double.json",
151+
"description": "The resolution in pixels of the viewshed.",
152+
"default": 2048
133153
}
134154
}
135155
}

Schema/Extensions/AGI/CustomPatternSensor.json

+21-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
},
8484
"environmentConstraint": {
8585
"$ref": "../../Boolean.json",
86-
"description": "Whether or not the sensor will intersect the environment, e.g. terrain or models.",
86+
"description": "Whether or not the sensor will be occluded by objects in the current view of the environment, e.g. visible terrain or models.",
8787
"default": false
8888
},
8989
"showEnvironmentOcclusion": {
@@ -115,6 +115,26 @@
115115
"$ref": "../../Boolean.json",
116116
"description": "Whether or not a sensor intersecting the ellipsoid is drawn through the ellipsoid and potentially out to the other side.",
117117
"default": false
118+
},
119+
"showViewshed": {
120+
"$ref": "../../Boolean.json",
121+
"description": "Whether or not the viewshed of the sensor will be drawn.",
122+
"default": false
123+
},
124+
"viewshedVisibleColor": {
125+
"$ref": "../../Color.json",
126+
"description": "The color of the scene geometry that is visible to the sensor.",
127+
"default": "lime, 50% transparent"
128+
},
129+
"viewshedOccludedColor": {
130+
"$ref": "../../Color.json",
131+
"description": "The color of the scene geometry that is not visible to the sensor.",
132+
"default": "red, 50% transparent"
133+
},
134+
"viewshedResolution": {
135+
"$ref": "../../Double.json",
136+
"description": "The resolution in pixels of the viewshed.",
137+
"default": 2048
118138
}
119139
}
120140
}

Schema/Extensions/AGI/RectangularSensor.json

+21-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
},
8989
"environmentConstraint": {
9090
"$ref": "../../Boolean.json",
91-
"description": "Whether or not the sensor will intersect the environment, e.g. terrain or models.",
91+
"description": "Whether or not the sensor will be occluded by objects in the current view of the environment, e.g. visible terrain or models.",
9292
"default": false
9393
},
9494
"showEnvironmentOcclusion": {
@@ -120,6 +120,26 @@
120120
"$ref": "../../Boolean.json",
121121
"description": "Whether or not a sensor intersecting the ellipsoid is drawn through the ellipsoid and potentially out to the other side.",
122122
"default": false
123+
},
124+
"showViewshed": {
125+
"$ref": "../../Boolean.json",
126+
"description": "Whether or not the viewshed of the sensor will be drawn.",
127+
"default": false
128+
},
129+
"viewshedVisibleColor": {
130+
"$ref": "../../Color.json",
131+
"description": "The color of the scene geometry that is visible to the sensor.",
132+
"default": "lime, 50% transparent"
133+
},
134+
"viewshedOccludedColor": {
135+
"$ref": "../../Color.json",
136+
"description": "The color of the scene geometry that is not visible to the sensor.",
137+
"default": "red, 50% transparent"
138+
},
139+
"viewshedResolution": {
140+
"$ref": "../../Double.json",
141+
"description": "The resolution in pixels of the viewshed.",
142+
"default": 2048
123143
}
124144
}
125145
}

0 commit comments

Comments
 (0)