Skip to content
GitLab
Commit 2410d1a1 authored by Patrick's avatar Patrick
Browse files

update not working

parent 455723d6
Hide whitespace changes
Inline Side-by-side
vcm/config.json
View file @ 2410d1a1
......@@ -159,6 +159,54 @@
"layerTypes": [""],
"layerNames": ["100002"]
},
{"template": [
"<div class='balloon' onclick='WeilimdorfAreaText()' id='myBalloon'>",
" <h1 class='balloon-title'>Gebiet Nummer 1</h1>",
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>","<p class='balloon-text'><span>Das hier ist ein Test Ballon. Es zeigt den Ballon zum Gebiet Nummer 1</span><br></p>",
"</div>","<% %>"
],
"minTop": "balloonHeight + 10",
"minLeft": "70",
"layerTypes": [""],
"layerNames": ["AreaOne"]
},
{"template": [
"<div class='balloon' onclick='WeilimdorfAreaText()' id='myBalloon'>",
" <h1 class='balloon-title'>Gebiet Nummer 2</h1>",
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>","<p class='balloon-text'><span>Das hier ist ein Test Ballon. Es zeigt den Ballon zum Gebiet Nummer 2</span><br></p>",
"</div>","<% %>"
],
"minTop": "balloonHeight + 10",
"minLeft": "70",
"layerTypes": [""],
"layerNames": ["AreaTwo"]
},
{"template": [
"<div class='balloon' onclick='WeilimdorfAreaText()' id='myBalloon'>",
" <h1 class='balloon-title'>Gebiet Nummer 3</h1>",
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>","<p class='balloon-text'><span>Das hier ist ein Test Ballon. Es zeigt den Ballon zum Gebiet Nummer 3</span><br></p>",
"</div>","<% %>"
],
"minTop": "balloonHeight + 10",
"minLeft": "70",
"layerTypes": [""],
"layerNames": ["AreaThree"]
},
{"template": [
"<div class='balloon' onclick='WeilimdorfAreaText()' id='myBalloon'>",
" <h1 class='balloon-title'>Gebiet Nummer 4</h1>",
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>","<p class='balloon-text'><span>Das hier ist ein Test Ballon. Es zeigt den Ballon zum Gebiet Nummer 4</span><br></p>",
"</div>","<% %>"
],
"minTop": "balloonHeight + 10",
"minLeft": "70",
"layerTypes": [""],
"layerNames": ["AreaFour"]
},
{
"template": [
"<div class='balloon' id='myBalloon'>",
......@@ -835,7 +883,25 @@
]
}
],
"layers": [{"name": "100005","url": "./templates/100005.geojson","type": "vcs.vcm.layer.GeoJSON","datasourceId": "...","activeOnStartup": true,"exclusive": false,"projection": { "epsg": "4326", "proj4": ""},"altitudeMode": "relativeToGround","style": { "image": { "icon": { "src": "./templates/locationSM.png", "scale": 0.5 } }},"heightAboveGround": 0},
"layers": [
{"name": "100005",
"url": "./templates/100005.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": true,
"exclusive": false,
"projection": { "epsg": "4326", "proj4": ""},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "./templates/locationSM.png",
"scale": 0.5
}
}
},
"heightAboveGround": 0
},
{
"name": "100004",
"url": "./templates/100004.geojson",
......@@ -853,7 +919,8 @@
}
}
},
"heightAboveGround": 0},
"heightAboveGround": 0
},
{"name": "ProjektNord",
"url": "./templates/100002.geojson",
......@@ -871,38 +938,6 @@
}},
"heightAboveGround": 0},
{
"name": "Böckingerstrasse",
"url": "./datasource-data/f02945f6-7978-4abc-940b-4c47af169b12/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "zECwoSwXppPMrqfbt",
"activeOnStartup": false,
"exclusive": false,
"allowPicking": true,
"screenSpaceError": 16,
"screenSpaceErrorMobile": 32,
"hiddenObjectIds": [],
"copyright": {
"provider": "",
"url": "",
"year": ""
}
},{
"name": "Stuttgart",
"url": "http://193.196.37.89:8092/AssetsHFT/3DTile_Stuttgart_City_LoD1_Georocket/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "zECwoSwXppPMrqfSt",
"activeOnStartup": false,
"exclusive": false,
"allowPicking": true,
"screenSpaceError": 16,
"screenSpaceErrorMobile": 32,
"hiddenObjectIds": [],
"copyright": {
"provider": "",
"url": "",
"year": ""
}
},{
"name": "StuttgartLocal",
"url": "./datasource-data/Weilimdorf/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings",
......@@ -918,50 +953,15 @@
"url": "",
"year": ""
}
},{
"name": "Rosenstein",
"url": "./datasource-data/Rosenstein/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "zECwoSwXppPMrqfRos",
"activeOnStartup": false,
"exclusive": false,
"allowPicking": true,
"screenSpaceError": 16,
"screenSpaceErrorMobile": 32,
"hiddenObjectIds": [],
"copyright": {
"provider": "",
"url": "",
"year": ""
}
},
{
"name": "Stöckach",
"url": "./datasource-data/Stockach/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "orpdK9eKzTLaDmYC9",
"activeOnStartup": false,
"exclusive": false,
"allowPicking": true,
"screenSpaceError": 16,
"screenSpaceErrorMobile": 32,
"hiddenObjectIds": ["DEBW522AA00022dcc","DEBW522AA0003bf3b","DEBW522AA0000976a","DEBW522AA00001d00"],
"copyright": {
"provider": "",
"url": "",
"year": ""
}
},{
"name": "StuttgartPart",
"url": "./datasource-data/PartOfStuggi/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "orpdK9eKzTLaDmStu",
"name": "DGM2",
"url": "/datasource-data/tileset",
"type": "vcs.vcm.layer.cesium.Terrain",
"datasourceId": "52hixWfozhzGYx76W",
"activeOnStartup": true,
"exclusive": false,
"allowPicking": true,
"screenSpaceError": 16,
"screenSpaceErrorMobile": 32,
"hiddenObjectIds": [],
"requestVertexNormals": true,
"copyright": {
"provider": "",
"url": "",
......@@ -1042,8 +1042,8 @@
"featureInfo": null,
"opacity": ""
},{
"name": "B",
"url": "./templates/AreaB.geojson",
"name": "AreaOne",
"url": "./templates/Area1.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
......@@ -1063,8 +1063,8 @@
},
"heightAboveGround": 0
},{
"name": "C1",
"url": "./templates/AreaC1.geojson",
"name": "AreaTwo",
"url": "./templates/Area2.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
......@@ -1084,8 +1084,8 @@
},
"heightAboveGround": 0
},{
"name": "ProjektOne",
"url": "./templates/ProjektOne.geojson",
"name": "AreaThree",
"url": "./templates/Area3.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
......@@ -1098,15 +1098,15 @@
"style": {
"image": {
"icon": {
"src": "./templates/lightning.png",
"src": "",
"scale": 0.5
}
}
},
"heightAboveGround": 0
},{
"name": "ProjektNord",
"url": "./templates/ProjektNord.geojson",
"name": "AreaFour",
"url": "./templates/Area4.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
......@@ -1119,7 +1119,7 @@
"style": {
"image": {
"icon": {
"src": "./templates/building.png",
"src": "",
"scale": 0.5
}
}
......@@ -1146,94 +1146,6 @@
}
},
"heightAboveGround": 0
},
{
"name": "LocationOne",
"url": "./templates/locationOne.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
"exclusive": false,
"projection": {
"epsg": "4326",
"proj4": ""
},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "./templates/locationSM.png",
"scale": 0.5
}
}
},
"heightAboveGround": 0
},
{
"name": "LocationTwo",
"url": "./templates/locationTwo.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
"exclusive": false,
"projection": {
"epsg": "4326",
"proj4": ""
},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "./templates/locationSM.png",
"scale": 0.5
}
}
},
"heightAboveGround": 0
},
{
"name": "LocationThree",
"url": "./templates/locationThree.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
"exclusive": false,
"projection": {
"epsg": "4326",
"proj4": ""
},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "./templates/locationSM.png",
"scale": 0.5
}
}
},
"heightAboveGround": 0
},
{
"name": "LocationFour",
"url": "./templates/locationFour.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
"exclusive": false,
"projection": {
"epsg": "4326",
"proj4": ""
},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "./templates/locationSM.png",
"scale": 0.5
}
}
},
"heightAboveGround": 0
}
],
"viewpoints": [
......
vcm/datasource-data/38b38a3b-46af-4571-91b7-897336bc9b56/shader_0.glsl deleted 100644 → 0
View file @ 455723d6
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;
}
vcm/datasource-data/38b38a3b-46af-4571-91b7-897336bc9b56/shader_1.glsl deleted 100644 → 0
View file @ 455723d6
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;
}
vcm/datasource-data/38b38a3b-46af-4571-91b7-897336bc9b56/tileset.json deleted 100644 → 0
View file @ 455723d6
{
"asset": {
"version": "1.0",
"tilesetVersion": "81635617907"
},
"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": {
"creationDate": {
"valueType": "STRING"
},
"gml:name": {
"valueType": "STRING"
}
},
"extras": {
"_3DTILESDIFFUSE": true
}
}
\ No newline at end of file
vcm/datasource-data/81eb0a93-dbfd-4c80-a51d-1ce3cee5c539/shader_0.glsl deleted 100644 → 0
View file @ 455723d6
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;
}
vcm/datasource-data/81eb0a93-dbfd-4c80-a51d-1ce3cee5c539/shader_1.glsl deleted 100644 → 0
View file @ 455723d6
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;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal