diff --git a/vcm/css/vcm.css b/vcm/css/vcm.css index 76fc536d56c3da210ec37c9a3e682a25e3c3e96d..e8b79df5e1646e4d528eaf2fe2644fe4fd3f54af 100644 --- a/vcm/css/vcm.css +++ b/vcm/css/vcm.css @@ -211,10 +211,10 @@ img.scale { .Cesium .featured-company{ float: left; background-size: contain; - background-position: 0%, 10%, 24%, 34%, 47%, 60%,73%,89%; + background-position: 0%, 10%, 24%, 34%, 47%, 60%,73%,92%; background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat; /* background-image: url("../images/cesium-logo.png"); */ - background-image: url(../icons/Türkis_Info.png),url(../legend/01_Legend.png), url(../icons/Türkis_multiplikatoren.png),url(../legend/02_Legend.png), url(../icons/Umfrage_Button_transpHintergrund_türkis.png),url(../legend/03_Legend.png),url(../legend/ABCDSymbol_Legend.png),url(../legend/04_Legend03.png); + background-image: url(../icons/Türkis_Info.png),url(../legend/01_Legend.png), url(../icons/Türkis_multiplikatoren.png),url(../legend/02_Legend.png), url(../icons/Umfrage_Button_transpHintergrund_türkis.png),url(../legend/03_Legend.png),url(../legend/ABCDSymbol_Legend.png),url(../legend/04_Legend04.png); width: 50rem; height: 50px; display: inline-block; diff --git a/vcm/datasource-data/Stockach/15/34441/7501.b3dm b/vcm/datasource-data/Stockach/15/34441/7501.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..45434938e207d053bb2dc7f80db0348e6961ac42 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34441/7501.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34441/7502.b3dm b/vcm/datasource-data/Stockach/15/34441/7502.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..e1b632243ef5b82f4856a024e53672e3cd5d1483 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34441/7502.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34442/7500.b3dm b/vcm/datasource-data/Stockach/15/34442/7500.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..fa1e4ce51b019ccc00f34c6735049a9a92b1f712 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34442/7500.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34442/7501.b3dm b/vcm/datasource-data/Stockach/15/34442/7501.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..bbb8447828ab6136c4cf9737e2f062f9a3d25d31 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34442/7501.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34442/7502.b3dm b/vcm/datasource-data/Stockach/15/34442/7502.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..d30eeebd6f25e314c4411a862061be24b3e9d185 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34442/7502.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34443/7501.b3dm b/vcm/datasource-data/Stockach/15/34443/7501.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..e012cc1ab5540499b19cf8c274b257c98c41cb95 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34443/7501.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34443/7502.b3dm b/vcm/datasource-data/Stockach/15/34443/7502.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..0b5960fcd8992c3880facbc44c40fac2e91e6418 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34443/7502.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34444/7500.b3dm b/vcm/datasource-data/Stockach/15/34444/7500.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..382bc217792645a11d788a2a39355b002fd4e738 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34444/7500.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34444/7501.b3dm b/vcm/datasource-data/Stockach/15/34444/7501.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..003cd78b003a3d14a604ecd26eafd87b145ff2b1 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34444/7501.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34444/7502.b3dm b/vcm/datasource-data/Stockach/15/34444/7502.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..83697f51d389f7fb4ff2a792514b32155743e013 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34444/7502.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34445/7501.b3dm b/vcm/datasource-data/Stockach/15/34445/7501.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..c8ec41451b38a4f7397d32be9a7b5a4981e12428 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34445/7501.b3dm differ diff --git a/vcm/datasource-data/Stockach/15/34445/7502.b3dm b/vcm/datasource-data/Stockach/15/34445/7502.b3dm new file mode 100644 index 0000000000000000000000000000000000000000..9176bf44b26495590650288841fb9fd3b3480647 Binary files /dev/null and b/vcm/datasource-data/Stockach/15/34445/7502.b3dm differ diff --git a/vcm/datasource-data/Stockach/shader_0.glsl b/vcm/datasource-data/Stockach/shader_0.glsl new file mode 100644 index 0000000000000000000000000000000000000000..ae2beb73f9789e3180b33aecb94d63135c5d5441 --- /dev/null +++ b/vcm/datasource-data/Stockach/shader_0.glsl @@ -0,0 +1,12 @@ +precision highp float; +uniform vec4 u_diffuse_mat; +varying vec3 v_normal; +varying float v_specularIntensity; +void main(void) { + float lambert = dot(v_normal,czm_sunDirectionEC); + float diffuseIntensity = (lambert + 1.0) * 0.5 * 1.0 + 0.3; + vec4 diffuseColor = u_diffuse_mat; + vec3 lightColor = vec3(1.0, 1.0, 1.0); + vec4 color = vec4(diffuseColor.rgb * diffuseIntensity + lightColor.rgb * v_specularIntensity, diffuseColor.a); + gl_FragColor = color; +} diff --git a/vcm/datasource-data/Stockach/shader_1.glsl b/vcm/datasource-data/Stockach/shader_1.glsl new file mode 100644 index 0000000000000000000000000000000000000000..c120ade392daa92ac421c66bfd94d55340f7f2bb --- /dev/null +++ b/vcm/datasource-data/Stockach/shader_1.glsl @@ -0,0 +1,18 @@ +uniform mat4 u_modelViewMatrix; +uniform mat4 u_projectionMatrix; +attribute vec3 a_position; +attribute float a_batchId; +attribute vec3 a_normal; +varying vec3 v_normal; +uniform mat3 u_normalMatrix; +uniform float u_shininess; +uniform float u_specularNorm; +varying float v_specularIntensity; +void main(void) { + vec4 pos = u_modelViewMatrix * vec4(a_position,1.0); + v_normal = normalize(u_normalMatrix * (a_normal)); + vec3 viewDir = -normalize(pos.xyz); + vec3 h = normalize(czm_sunDirectionEC + viewDir); + v_specularIntensity = max(0., pow(max(dot(v_normal, h), 0.), u_shininess)) * u_specularNorm * 0.0; + gl_Position = u_projectionMatrix * pos; +} diff --git a/vcm/datasource-data/Stockach/tileset.json b/vcm/datasource-data/Stockach/tileset.json new file mode 100644 index 0000000000000000000000000000000000000000..476c5f12c186385b5ac21bcb584804a897885593 --- /dev/null +++ b/vcm/datasource-data/Stockach/tileset.json @@ -0,0 +1,341 @@ +{ + "asset": { + "version": "1.0", + "tilesetVersion": "106268978558" + }, + "geometricError": 48.828125, + "root": { + "boundingVolume": { + "region": [ + 0.160396866, + 0.851455211, + 0.160876235, + 0.851742832, + 0.0, + 63.2 + ] + }, + "geometricError": 24.4140625, + "refine": "ADD", + "children": [ + { + "boundingVolume": { + "region": [ + 0.160396866, + 0.85154185, + 0.160522913, + 0.851646958, + 0.0, + 38.2 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160433696, + 0.85154185, + 0.160522913, + 0.851642355, + 0.0, + 38.2 + ] + }, + "uri": "15/34441/7501.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160396866, + 0.851455211, + 0.160494697, + 0.851552905, + 0.0, + 38.8 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160423931, + 0.851501833, + 0.160494697, + 0.851552905, + 0.0, + 38.8 + ] + }, + "uri": "15/34441/7502.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160492739, + 0.851635288, + 0.160588613, + 0.851742832, + 0.0, + 24.3 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160518623, + 0.851635288, + 0.160563251, + 0.851663454, + 0.0, + 24.3 + ] + }, + "uri": "15/34442/7500.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160492739, + 0.851547719, + 0.160595362, + 0.851646958, + 0.0, + 34.7 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.16049726, + 0.851547719, + 0.160595362, + 0.851629215, + 0.0, + 34.7 + ] + }, + "uri": "15/34442/7501.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160484184, + 0.851455211, + 0.160588613, + 0.851552843, + 0.0, + 51.4 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160484184, + 0.851498948, + 0.160588295, + 0.851552843, + 0.0, + 51.4 + ] + }, + "uri": "15/34442/7502.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160568482, + 0.85154396, + 0.160684487, + 0.851646958, + 0.0, + 63.2 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160568482, + 0.85154396, + 0.160682454, + 0.851644258, + 0.0, + 63.2 + ] + }, + "uri": "15/34443/7501.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160584067, + 0.851455211, + 0.160686053, + 0.851551875, + 0.0, + 46.2 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160584067, + 0.851499898, + 0.160686053, + 0.851551875, + 0.0, + 46.2 + ] + }, + "uri": "15/34443/7502.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160684487, + 0.851644337, + 0.160780361, + 0.851742832, + 0.0, + 15.5 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160757869, + 0.851644337, + 0.160767401, + 0.851657593, + 0.0, + 15.5 + ] + }, + "uri": "15/34444/7500.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160680673, + 0.851549281, + 0.160780455, + 0.851647774, + 0.0, + 33.8 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "uri": "15/34444/7501.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160683536, + 0.851455211, + 0.160782884, + 0.851556049, + 0.0, + 28.0 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160683536, + 0.851501676, + 0.160782884, + 0.851556049, + 0.0, + 28.0 + ] + }, + "uri": "15/34444/7502.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160772842, + 0.851551084, + 0.160876235, + 0.851671258, + 0.0, + 27.7 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160772842, + 0.851551323, + 0.160870326, + 0.851671258, + 0.0, + 27.7 + ] + }, + "uri": "15/34445/7501.b3dm" + } + }, + { + "boundingVolume": { + "region": [ + 0.160780361, + 0.851455211, + 0.160876235, + 0.851560604, + 0.0, + 29.8 + ] + }, + "geometricError": 0.0, + "refine": "REPLACE", + "content": { + "boundingVolume": { + "region": [ + 0.160781383, + 0.851503338, + 0.160868284, + 0.851560604, + 0.0, + 29.8 + ] + }, + "uri": "15/34445/7502.b3dm" + } + } + ] + }, + "properties": {}, + "extras": { + "_3DTILESDIFFUSE": true + } +} \ No newline at end of file diff --git a/vcm/legend/04_Legend04.png b/vcm/legend/04_Legend04.png new file mode 100644 index 0000000000000000000000000000000000000000..6ee7fdaadee625dd7ea96976657f6ec55250a0f2 Binary files /dev/null and b/vcm/legend/04_Legend04.png differ