Skip to content
GitLab
Commit ccf308d4 authored by Sven Schneider's avatar Sven Schneider
Browse files

replaced OSM Bld Layer with Stoeackach 3dTile model and changed target bld... 

replaced OSM Bld Layer with Stoeackach 3dTile model and changed target bld color to red, removed also the other layers
parent 7650aca2
Pipeline #3405 passed with stages
in 37 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 573 additions and 570 deletions
+573 -570
public/Kirchturm1.js
+ 137
- 137
View file @ ccf308d4
...@@ -59,51 +59,51 @@ $(function () { ...@@ -59,51 +59,51 @@ $(function () {
canvas.focus(); canvas.focus();
var scene = viewer.scene; var scene = viewer.scene;
var osmBuildings = viewer.scene.primitives.add( // var osmBuildings = viewer.scene.primitives.add(
new Cesium.Cesium3DTileset({ // new Cesium.Cesium3DTileset({
url: Cesium.IonResource.fromAssetId(96188), // url: Cesium.IonResource.fromAssetId(96188),
}) // })
); // );
const buildingHeightOffset = 60; //53 const buildingHeightOffset = 55; //53
///////////////////// STOECKACH LOD 1 ///////////////////// STOECKACH LOD 1
// var stoeckach = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ var stoeckach = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
// url: 'buildingTiles/StoeckachLOD1/tileset.json', url: 'buildingTiles/StoeckachLOD1/tileset.json',
// show: true show: true
// })); }));
// stoeckach.readyPromise.then(function (stoeckach) { stoeckach.readyPromise.then(function (stoeckach) {
// var R = 0; // roll var R = 0; // roll
// var P = 0; // pitch var P = 0; // pitch
// var Yaw = 0; // yaw var Yaw = 0; // yaw
// var height = buildingHeightOffset; var height = buildingHeightOffset -1 ;
// var cartographic = Cesium.Cartographic.fromCartesian(stoeckach.boundingSphere.center); var cartographic = Cesium.Cartographic.fromCartesian(stoeckach.boundingSphere.center);
// var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
// var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
// var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
// //var rotMat = new Cesium.Matrix3(); //var rotMat = new Cesium.Matrix3();
// var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
// stoeckach.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); stoeckach.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
// return zoomAll(stoeckach); return zoomAll(stoeckach);
// }); });
// stoeckach.readyPromise.then(function(stoeckach){ stoeckach.readyPromise.then(function(stoeckach){
// stoeckach.style = new Cesium.Cesium3DTileStyle({ stoeckach.style = new Cesium.Cesium3DTileStyle({
// color: "color('white',0.5)", color: "color('white',1)",
// }) })
// }); });
...@@ -138,7 +138,7 @@ $(function () { ...@@ -138,7 +138,7 @@ $(function () {
target_tileset.readyPromise.then(function(target_tileset){ target_tileset.readyPromise.then(function(target_tileset){
target_tileset.style = new Cesium.Cesium3DTileStyle({ target_tileset.style = new Cesium.Cesium3DTileStyle({
color: "color('black',0.5)", color: "color('red',0.9)",
}) })
}); });
...@@ -147,157 +147,157 @@ $(function () { ...@@ -147,157 +147,157 @@ $(function () {
///////////////////////////// Layer one ////////////////////////// ///////////////////////////// Layer one //////////////////////////
var L1 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L1 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L1_yellow/tileset.json', // url: 'buildingTiles/circularTiles/L1_yellow/tileset.json',
show: true, // show: true,
})); // }));
L1.readyPromise.then(function (L1) { // L1.readyPromise.then(function (L1) {
return zoomAll(L1); // return zoomAll(L1);
}); // });
L1.readyPromise.then(function (L1) { // L1.readyPromise.then(function (L1) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L1.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L1.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L1.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L1.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L1); // return zoomAll(L1);
}); // });
L1.readyPromise.then(function(L1){ // L1.readyPromise.then(function(L1){
L1.style = new Cesium.Cesium3DTileStyle({ // L1.style = new Cesium.Cesium3DTileStyle({
color: "color('yellow',1)", // color: "color('yellow',1)",
}) // })
}); // });
///////////////////////////// Layer 2 ////////////////////////// // ///////////////////////////// Layer 2 //////////////////////////
var L2 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L2 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L2_red/tileset.json', // url: 'buildingTiles/circularTiles/L2_red/tileset.json',
show: true, // show: true,
})); // }));
L2.readyPromise.then(function (L2) { // L2.readyPromise.then(function (L2) {
return zoomAll(L2); // return zoomAll(L2);
}); // });
L2.readyPromise.then(function (L2) { // L2.readyPromise.then(function (L2) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L2.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L2.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L2.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L2.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L2); // return zoomAll(L2);
}); // });
L2.readyPromise.then(function(L2){ // L2.readyPromise.then(function(L2){
L2.style = new Cesium.Cesium3DTileStyle({ // L2.style = new Cesium.Cesium3DTileStyle({
color: "color('red',1)", // color: "color('red',1)",
}) // })
}); // });
///////////////////////////// Layer 3 ////////////////////////// // ///////////////////////////// Layer 3 //////////////////////////
var L3 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L3 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L3_green/tileset.json', // url: 'buildingTiles/circularTiles/L3_green/tileset.json',
show: true, // show: true,
})); // }));
L3.readyPromise.then(function (L3) { // L3.readyPromise.then(function (L3) {
return zoomAll(L3); // return zoomAll(L3);
}); // });
L3.readyPromise.then(function (L3) { // L3.readyPromise.then(function (L3) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L3.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L3.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L3.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L3.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L3); // return zoomAll(L3);
}); // });
L3.readyPromise.then(function(L3){ // L3.readyPromise.then(function(L3){
L3.style = new Cesium.Cesium3DTileStyle({ // L3.style = new Cesium.Cesium3DTileStyle({
color: "color('green',1)", // color: "color('green',1)",
}) // })
}); // });
///////////////////////////// Layer 3 ////////////////////////// // ///////////////////////////// Layer 3 //////////////////////////
var L4 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L4 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L4_brown/tileset.json', // url: 'buildingTiles/circularTiles/L4_brown/tileset.json',
show: true, // show: true,
})); // }));
L4.readyPromise.then(function (L4) { // L4.readyPromise.then(function (L4) {
return zoomAll(L4); // return zoomAll(L4);
}); // });
L4.readyPromise.then(function (L4) { // L4.readyPromise.then(function (L4) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L4.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L4.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L4.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L4.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L4); // return zoomAll(L4);
}); // });
L4.readyPromise.then(function(L4){ // L4.readyPromise.then(function(L4){
L4.style = new Cesium.Cesium3DTileStyle({ // L4.style = new Cesium.Cesium3DTileStyle({
color: "color('CORAL',1)", // color: "color('CORAL',1)",
}) // })
}); // });
var camera = viewer.camera; var camera = viewer.camera;
......
public/Kirchturm2.js
+ 138
- 138
View file @ ccf308d4
...@@ -59,51 +59,51 @@ $(function () { ...@@ -59,51 +59,51 @@ $(function () {
canvas.focus(); canvas.focus();
var scene = viewer.scene; var scene = viewer.scene;
var osmBuildings = viewer.scene.primitives.add( // var osmBuildings = viewer.scene.primitives.add(
new Cesium.Cesium3DTileset({ // new Cesium.Cesium3DTileset({
url: Cesium.IonResource.fromAssetId(96188), // url: Cesium.IonResource.fromAssetId(96188),
}) // })
); // );
const buildingHeightOffset = 60; //53 const buildingHeightOffset = 55; //53
///////////////////// STOECKACH LOD 1 ///////////////////// STOECKACH LOD 1
// var stoeckach = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ var stoeckach = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
// url: 'buildingTiles/StoeckachLOD1/tileset.json', url: 'buildingTiles/StoeckachLOD1/tileset.json',
// show: true show: true
// })); }));
// stoeckach.readyPromise.then(function (stoeckach) { stoeckach.readyPromise.then(function (stoeckach) {
// var R = 0; // roll var R = 0; // roll
// var P = 0; // pitch var P = 0; // pitch
// var Yaw = 0; // yaw var Yaw = 0; // yaw
// var height = buildingHeightOffset; var height = buildingHeightOffset - 1;
// var cartographic = Cesium.Cartographic.fromCartesian(stoeckach.boundingSphere.center); var cartographic = Cesium.Cartographic.fromCartesian(stoeckach.boundingSphere.center);
// var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
// var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
// var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
// //var rotMat = new Cesium.Matrix3(); //var rotMat = new Cesium.Matrix3();
// var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
// stoeckach.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); stoeckach.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
// return zoomAll(stoeckach); return zoomAll(stoeckach);
// }); });
// stoeckach.readyPromise.then(function(stoeckach){ stoeckach.readyPromise.then(function(stoeckach){
// stoeckach.style = new Cesium.Cesium3DTileStyle({ stoeckach.style = new Cesium.Cesium3DTileStyle({
// color: "color('white',0.5)", color: "color('white',1)",
// }) })
// }); });
...@@ -138,166 +138,166 @@ $(function () { ...@@ -138,166 +138,166 @@ $(function () {
target_tileset.readyPromise.then(function(target_tileset){ target_tileset.readyPromise.then(function(target_tileset){
target_tileset.style = new Cesium.Cesium3DTileStyle({ target_tileset.style = new Cesium.Cesium3DTileStyle({
color: "color('black',0.5)", color: "color('red',0.9)",
}) })
}); });
///////////////////////////// Layer one ////////////////////////// // ///////////////////////////// Layer one //////////////////////////
var L1 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L1 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L1_yellow/tileset.json', // url: 'buildingTiles/circularTiles/L1_yellow/tileset.json',
show: true, // show: true,
})); // }));
L1.readyPromise.then(function (L1) { // L1.readyPromise.then(function (L1) {
return zoomAll(L1); // return zoomAll(L1);
}); // });
L1.readyPromise.then(function (L1) { // L1.readyPromise.then(function (L1) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L1.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L1.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L1.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L1.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L1); // return zoomAll(L1);
}); // });
L1.readyPromise.then(function(L1){ // L1.readyPromise.then(function(L1){
L1.style = new Cesium.Cesium3DTileStyle({ // L1.style = new Cesium.Cesium3DTileStyle({
color: "color('yellow',1)", // color: "color('yellow',1)",
}) // })
}); // });
///////////////////////////// Layer 2 ////////////////////////// // ///////////////////////////// Layer 2 //////////////////////////
var L2 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L2 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L2_red/tileset.json', // url: 'buildingTiles/circularTiles/L2_red/tileset.json',
show: true, // show: true,
})); // }));
L2.readyPromise.then(function (L2) { // L2.readyPromise.then(function (L2) {
return zoomAll(L2); // return zoomAll(L2);
}); // });
L2.readyPromise.then(function (L2) { // L2.readyPromise.then(function (L2) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L2.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L2.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L2.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L2.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L2); // return zoomAll(L2);
}); // });
L2.readyPromise.then(function(L2){ // L2.readyPromise.then(function(L2){
L2.style = new Cesium.Cesium3DTileStyle({ // L2.style = new Cesium.Cesium3DTileStyle({
color: "color('red',1)", // color: "color('red',1)",
}) // })
}); // });
///////////////////////////// Layer 3 ////////////////////////// // ///////////////////////////// Layer 3 //////////////////////////
var L3 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L3 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L3_green/tileset.json', // url: 'buildingTiles/circularTiles/L3_green/tileset.json',
show: true, // show: true,
})); // }));
L3.readyPromise.then(function (L3) { // L3.readyPromise.then(function (L3) {
return zoomAll(L3); // return zoomAll(L3);
}); // });
L3.readyPromise.then(function (L3) { // L3.readyPromise.then(function (L3) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L3.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L3.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L3.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L3.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L3); // return zoomAll(L3);
}); // });
L3.readyPromise.then(function(L3){ // L3.readyPromise.then(function(L3){
L3.style = new Cesium.Cesium3DTileStyle({ // L3.style = new Cesium.Cesium3DTileStyle({
color: "color('green',1)", // color: "color('green',1)",
}) // })
}); // });
///////////////////////////// Layer 3 ////////////////////////// // ///////////////////////////// Layer 3 //////////////////////////
var L4 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ // var L4 = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: 'buildingTiles/circularTiles/L4_brown/tileset.json', // url: 'buildingTiles/circularTiles/L4_brown/tileset.json',
show: true, // show: true,
})); // }));
L4.readyPromise.then(function (L4) { // L4.readyPromise.then(function (L4) {
return zoomAll(L4); // return zoomAll(L4);
}); // });
L4.readyPromise.then(function (L4) { // L4.readyPromise.then(function (L4) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian(L4.boundingSphere.center); // var cartographic = Cesium.Cartographic.fromCartesian(L4.boundingSphere.center);
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); // var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0);
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); // var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height);
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); // var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R)); // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
L4.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation); // L4.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
return zoomAll(L4); // return zoomAll(L4);
}); // });
L4.readyPromise.then(function(L4){ // L4.readyPromise.then(function(L4){
L4.style = new Cesium.Cesium3DTileStyle({ // L4.style = new Cesium.Cesium3DTileStyle({
color: "color('CORAL',1)", // color: "color('CORAL',1)",
}) // })
}); // });
var camera = viewer.camera; var camera = viewer.camera;
......
public/circData.js
+ 295
- 292
View file @ ccf308d4
...@@ -66,45 +66,41 @@ $(function () { ...@@ -66,45 +66,41 @@ $(function () {
canvas.focus(); canvas.focus();
var scene = viewer.scene; var scene = viewer.scene;
// viewer.scene.globe.depthTestAgainstTerrain = false;
// var osmBuildings = Cesium.createOsmBuildings();
// osmBuildings.readyPromise
// viewer.scene.globe.depthTestAgainstTerrain = false; // .then(function (osmBuildings) {
// viewer.scene.primitives.add(osmBuildings);
// var osmBuildings = Cesium.createOsmBuildings(); // })
// osmBuildings.readyPromise // .otherwise(function (error) {
// .then(function (osmBuildings) { // console.log(error);
// viewer.scene.primitives.add(osmBuildings); // });
// })
// .otherwise(function (error) { // osmBuildings.readyPromise.then(function (osmBuildings) {
// console.log(error); // var height = 60;
// }); // var cartographic = Cesium.Cartographic.fromCartesian(
// osmBuildings.boundingSphere.center
// osmBuildings.readyPromise.then(function (osmBuildings) { // );
// var height = 60; // var surface = Cesium.Cartesian3.fromRadians(
// var cartographic = Cesium.Cartographic.fromCartesian( // cartographic.longitude,
// osmBuildings.boundingSphere.center // cartographic.latitude,
// ); // 0.0
// var surface = Cesium.Cartesian3.fromRadians( // );
// cartographic.longitude, // var offset = Cesium.Cartesian3.fromRadians(
// cartographic.latitude, // cartographic.longitude,
// 0.0 // cartographic.latitude,
// ); // height
// var offset = Cesium.Cartesian3.fromRadians( // );
// cartographic.longitude, // var translation = Cesium.Cartesian3.subtract(
// cartographic.latitude, // offset,
// height // surface,
// ); // new Cesium.Cartesian3()
// var translation = Cesium.Cartesian3.subtract( // );
// offset,
// surface, // osmBuildings.modelMatrix = Cesium.Matrix4.fromTranslation(translation);
// new Cesium.Cartesian3()
// ); // });
// osmBuildings.modelMatrix = Cesium.Matrix4.fromTranslation(translation);
// });
// viewer.terrainProvider = new Cesium.CesiumTerrainProvider({ // viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
// url: Cesium.IonResource.fromAssetId(1) // url: Cesium.IonResource.fromAssetId(1)
...@@ -112,36 +108,33 @@ $(function () { ...@@ -112,36 +108,33 @@ $(function () {
const buildingHeightOffset = 55; //53 const buildingHeightOffset = 55; //53
// --------------------------------------------------------------------
var relativeHeight = 0.0;
var scale = 1.5;
function getEastNorthUpTransform(tileset, relativeHeight) {
// --------------------------------------------------------------------
var relativeHeight = 0.0;
var scale = 1.5
function getEastNorthUpTransform(tileset, relativeHeight) {
var origin = tileset.boundingSphere.center; var origin = tileset.boundingSphere.center;
var cartographic = Cesium.Cartographic.fromCartesian(origin); var cartographic = Cesium.Cartographic.fromCartesian(origin);
cartographic.height = relativeHeight; cartographic.height = relativeHeight;
origin = Cesium.Cartographic.toCartesian(cartographic); origin = Cesium.Cartographic.toCartesian(cartographic);
var enu = Cesium.Transforms.eastNorthUpToFixedFrame(origin); var enu = Cesium.Transforms.eastNorthUpToFixedFrame(origin);
return enu; return enu;
} }
function getScaleTransform(tileset, scale, relativeHeight) { function getScaleTransform(tileset, scale, relativeHeight) {
var toGlobal = getEastNorthUpTransform(tileset, relativeHeight); var toGlobal = getEastNorthUpTransform(tileset, relativeHeight);
var toLocal = Cesium.Matrix4.inverse(toGlobal, new Cesium.Matrix4()); var toLocal = Cesium.Matrix4.inverse(toGlobal, new Cesium.Matrix4());
var localScale = new Cesium.Cartesian3(scale, scale, scale); var localScale = new Cesium.Cartesian3(scale, scale, scale);
var localScaleMatrix = Cesium.Matrix4.fromScale(localScale); var localScaleMatrix = Cesium.Matrix4.fromScale(localScale);
var transform = Cesium.Matrix4.multiply(toGlobal, Cesium.Matrix4.multiply(localScaleMatrix, toLocal, new Cesium.Matrix4()), new Cesium.Matrix4()); var transform = Cesium.Matrix4.multiply(
toGlobal,
Cesium.Matrix4.multiply(localScaleMatrix, toLocal, new Cesium.Matrix4()),
new Cesium.Matrix4()
);
return transform; return transform;
} }
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
///////////////////////////// Target ////////////////////////// ///////////////////////////// Target //////////////////////////
...@@ -153,7 +146,6 @@ function getScaleTransform(tileset, scale, relativeHeight) { ...@@ -153,7 +146,6 @@ function getScaleTransform(tileset, scale, relativeHeight) {
); );
target_tileset.readyPromise.then(function (target_tileset) { target_tileset.readyPromise.then(function (target_tileset) {
var height = buildingHeightOffset; var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian( var cartographic = Cesium.Cartographic.fromCartesian(
target_tileset.boundingSphere.center target_tileset.boundingSphere.center
...@@ -174,262 +166,258 @@ function getScaleTransform(tileset, scale, relativeHeight) { ...@@ -174,262 +166,258 @@ function getScaleTransform(tileset, scale, relativeHeight) {
new Cesium.Cartesian3() new Cesium.Cartesian3()
); );
target_tileset.modelMatrix = Cesium.Matrix4.fromTranslation(translation);
target_tileset.modelMatrix = Cesium.Matrix4.fromTranslation( return zoomAll(target_tileset);
translation
);
}); });
target_tileset.readyPromise.then(function (target_tileset) { target_tileset.readyPromise.then(function (target_tileset) {
target_tileset.style = new Cesium.Cesium3DTileStyle({ target_tileset.style = new Cesium.Cesium3DTileStyle({
color: "color('black',0.5)", color: "color('red',0.9)",
}); });
}); });
// target_tileset.root.transform = getScaleTransform(target_tileset, scale, relativeHeight); // target_tileset.root.transform = getScaleTransform(target_tileset, scale, relativeHeight);
///////////////////////////// Layer one ////////////////////////// // ///////////////////////////// Layer one //////////////////////////
var L1 = viewer.scene.primitives.add( // var L1 = viewer.scene.primitives.add(
new Cesium.Cesium3DTileset({ // new Cesium.Cesium3DTileset({
url: "buildingTiles/circularTiles/L1_yellow/tileset.json", // url: "buildingTiles/circularTiles/L1_yellow/tileset.json",
show: true, // show: true,
}) // })
); // );
L1.readyPromise.then(function (L1) { // L1.readyPromise.then(function (L1) {
return zoomAll(L1); // return zoomAll(L1);
}); // });
L1.readyPromise.then(function (L1) { // L1.readyPromise.then(function (L1) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian( // var cartographic = Cesium.Cartographic.fromCartesian(
L1.boundingSphere.center // L1.boundingSphere.center
); // );
var surface = Cesium.Cartesian3.fromRadians( // var surface = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
0.0 // 0.0
); // );
var offset = Cesium.Cartesian3.fromRadians( // var offset = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
height // height
); // );
var translation = Cesium.Cartesian3.subtract( // var translation = Cesium.Cartesian3.subtract(
offset, // offset,
surface, // surface,
new Cesium.Cartesian3() // new Cesium.Cartesian3()
); // );
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll( // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(
new Cesium.HeadingPitchRoll(Yaw, P, R) // new Cesium.HeadingPitchRoll(Yaw, P, R)
); // );
L1.modelMatrix = Cesium.Matrix4.fromRotationTranslation( // L1.modelMatrix = Cesium.Matrix4.fromRotationTranslation(
rotation, // rotation,
translation // translation
); // );
return zoomAll(L1); // return zoomAll(L1);
}); // });
L1.readyPromise.then(function (L1) { // L1.readyPromise.then(function (L1) {
L1.style = new Cesium.Cesium3DTileStyle({ // L1.style = new Cesium.Cesium3DTileStyle({
color: "color('yellow',1)", // color: "color('yellow',1)",
}); // });
}); // });
///////////////////////////// Layer 2 ////////////////////////// // ///////////////////////////// Layer 2 //////////////////////////
var L2 = viewer.scene.primitives.add( // var L2 = viewer.scene.primitives.add(
new Cesium.Cesium3DTileset({ // new Cesium.Cesium3DTileset({
url: "buildingTiles/circularTiles/L2_red/tileset.json", // url: "buildingTiles/circularTiles/L2_red/tileset.json",
show: true, // show: true,
}) // })
); // );
L2.readyPromise.then(function (L2) { // L2.readyPromise.then(function (L2) {
return zoomAll(L2); // return zoomAll(L2);
}); // });
L2.readyPromise.then(function (L2) { // L2.readyPromise.then(function (L2) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian( // var cartographic = Cesium.Cartographic.fromCartesian(
L2.boundingSphere.center // L2.boundingSphere.center
); // );
var surface = Cesium.Cartesian3.fromRadians( // var surface = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
0.0 // 0.0
); // );
var offset = Cesium.Cartesian3.fromRadians( // var offset = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
height // height
); // );
var translation = Cesium.Cartesian3.subtract( // var translation = Cesium.Cartesian3.subtract(
offset, // offset,
surface, // surface,
new Cesium.Cartesian3() // new Cesium.Cartesian3()
); // );
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll( // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(
new Cesium.HeadingPitchRoll(Yaw, P, R) // new Cesium.HeadingPitchRoll(Yaw, P, R)
); // );
L2.modelMatrix = Cesium.Matrix4.fromRotationTranslation( // L2.modelMatrix = Cesium.Matrix4.fromRotationTranslation(
rotation, // rotation,
translation // translation
); // );
return zoomAll(L2); // return zoomAll(L2);
}); // });
L2.readyPromise.then(function (L2) { // L2.readyPromise.then(function (L2) {
L2.style = new Cesium.Cesium3DTileStyle({ // L2.style = new Cesium.Cesium3DTileStyle({
color: "color('red',1)", // color: "color('red',1)",
}); // });
}); // });
///////////////////////////// Layer 3 ////////////////////////// // ///////////////////////////// Layer 3 //////////////////////////
var L3 = viewer.scene.primitives.add( // var L3 = viewer.scene.primitives.add(
new Cesium.Cesium3DTileset({ // new Cesium.Cesium3DTileset({
url: "buildingTiles/circularTiles/L3_green/tileset.json", // url: "buildingTiles/circularTiles/L3_green/tileset.json",
show: true, // show: true,
}) // })
); // );
L3.readyPromise.then(function (L3) { // L3.readyPromise.then(function (L3) {
return zoomAll(L3); // return zoomAll(L3);
}); // });
L3.readyPromise.then(function (L3) { // L3.readyPromise.then(function (L3) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian( // var cartographic = Cesium.Cartographic.fromCartesian(
L3.boundingSphere.center // L3.boundingSphere.center
); // );
var surface = Cesium.Cartesian3.fromRadians( // var surface = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
0.0 // 0.0
); // );
var offset = Cesium.Cartesian3.fromRadians( // var offset = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
height // height
); // );
var translation = Cesium.Cartesian3.subtract( // var translation = Cesium.Cartesian3.subtract(
offset, // offset,
surface, // surface,
new Cesium.Cartesian3() // new Cesium.Cartesian3()
); // );
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll( // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(
new Cesium.HeadingPitchRoll(Yaw, P, R) // new Cesium.HeadingPitchRoll(Yaw, P, R)
); // );
L3.modelMatrix = Cesium.Matrix4.fromRotationTranslation( // L3.modelMatrix = Cesium.Matrix4.fromRotationTranslation(
rotation, // rotation,
translation // translation
); // );
return zoomAll(L3); // return zoomAll(L3);
}); // });
L3.readyPromise.then(function (L3) { // L3.readyPromise.then(function (L3) {
L3.style = new Cesium.Cesium3DTileStyle({ // L3.style = new Cesium.Cesium3DTileStyle({
color: "color('green',1)", // color: "color('green',1)",
}); // });
}); // });
///////////////////////////// Layer 3 ////////////////////////// // ///////////////////////////// Layer 3 //////////////////////////
var L4 = viewer.scene.primitives.add( // var L4 = viewer.scene.primitives.add(
new Cesium.Cesium3DTileset({ // new Cesium.Cesium3DTileset({
url: "buildingTiles/circularTiles/L4_brown/tileset.json", // url: "buildingTiles/circularTiles/L4_brown/tileset.json",
show: true, // show: true,
}) // })
); // );
L4.readyPromise.then(function (L4) { // L4.readyPromise.then(function (L4) {
return zoomAll(L4); // return zoomAll(L4);
}); // });
L4.readyPromise.then(function (L4) { // L4.readyPromise.then(function (L4) {
var R = 0; // roll // var R = 0; // roll
var P = 0; // pitch // var P = 0; // pitch
var Yaw = 0; // yaw // var Yaw = 0; // yaw
var height = buildingHeightOffset; // var height = buildingHeightOffset;
var cartographic = Cesium.Cartographic.fromCartesian( // var cartographic = Cesium.Cartographic.fromCartesian(
L4.boundingSphere.center // L4.boundingSphere.center
); // );
var surface = Cesium.Cartesian3.fromRadians( // var surface = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
0.0 // 0.0
); // );
var offset = Cesium.Cartesian3.fromRadians( // var offset = Cesium.Cartesian3.fromRadians(
cartographic.longitude, // cartographic.longitude,
cartographic.latitude, // cartographic.latitude,
height // height
); // );
var translation = Cesium.Cartesian3.subtract( // var translation = Cesium.Cartesian3.subtract(
offset, // offset,
surface, // surface,
new Cesium.Cartesian3() // new Cesium.Cartesian3()
); // );
//var rotMat = new Cesium.Matrix3(); // //var rotMat = new Cesium.Matrix3();
var rotation = new Cesium.Matrix3.fromHeadingPitchRoll( // var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(
new Cesium.HeadingPitchRoll(Yaw, P, R) // new Cesium.HeadingPitchRoll(Yaw, P, R)
); // );
L4.modelMatrix = Cesium.Matrix4.fromRotationTranslation( // L4.modelMatrix = Cesium.Matrix4.fromRotationTranslation(
rotation, // rotation,
translation // translation
); // );
return zoomAll(L4); // return zoomAll(L4);
}); // });
L4.readyPromise.then(function (L4) { // L4.readyPromise.then(function (L4) {
L4.style = new Cesium.Cesium3DTileStyle({ // L4.style = new Cesium.Cesium3DTileStyle({
color: "color('CORAL',1)", // color: "color('CORAL',1)",
}); // });
}); // });
var camera = viewer.camera; // var camera = viewer.camera;
var controller = scene.screenSpaceCameraController; // var controller = scene.screenSpaceCameraController;
var r = 0; // var r = 0;
var center = new Cesium.Cartesian3(); // var center = new Cesium.Cartesian3();
var hpRoll = new Cesium.HeadingPitchRoll(); // var hpRoll = new Cesium.HeadingPitchRoll();
var hpRange = new Cesium.HeadingPitchRange(); // var hpRange = new Cesium.HeadingPitchRange();
var speed = 0.1; // var speed = 0.1;
var deltaRadians = Cesium.Math.toRadians(3.0); // var deltaRadians = Cesium.Math.toRadians(3.0);
var position = Cesium.Cartesian3.fromDegrees(9.190471, 48.786782, 0.0); // var position = Cesium.Cartesian3.fromDegrees(9.190471, 48.786782, 0.0);
var speedVector = new Cesium.Cartesian3(); // var speedVector = new Cesium.Cartesian3();
var fixedFrameTransform = Cesium.Transforms.localFrameToFixedFrameGenerator( // var fixedFrameTransform = Cesium.Transforms.localFrameToFixedFrameGenerator(
"north", // "north",
"west" // "west"
); // );
viewer.scene.globe.enableLighting = true; // set lighting to true viewer.scene.globe.enableLighting = true; // set lighting to true
...@@ -447,31 +435,46 @@ function getScaleTransform(tileset, scale, relativeHeight) { ...@@ -447,31 +435,46 @@ function getScaleTransform(tileset, scale, relativeHeight) {
}); });
}; };
///////////////// STOECKACH LOD 1 ///////////////// STOECKACH LOD 1
var stoeckach = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ var stoeckach = viewer.scene.primitives.add(
url: 'buildingTiles/StoeckachLOD1/tileset.json', new Cesium.Cesium3DTileset({
show: true url: "buildingTiles/StoeckachLOD1/tileset.json",
})); show: true,
})
stoeckach.readyPromise.then(function (stoeckach) { );
stoeckach.readyPromise.then(function (stoeckach) {
var height = buildingHeightOffset-1; var height = buildingHeightOffset - 1;
var cartographic = Cesium.Cartographic.fromCartesian(stoeckach.boundingSphere.center); var cartographic = Cesium.Cartographic.fromCartesian(
var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 0.0); stoeckach.boundingSphere.center
var offset = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height); );
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); var surface = Cesium.Cartesian3.fromRadians(
cartographic.longitude,
cartographic.latitude,
0.0
);
var offset = Cesium.Cartesian3.fromRadians(
cartographic.longitude,
cartographic.latitude,
height
);
var translation = Cesium.Cartesian3.subtract(
offset,
surface,
new Cesium.Cartesian3()
);
stoeckach.modelMatrix = Cesium.Matrix4.fromTranslation(translation); stoeckach.modelMatrix = Cesium.Matrix4.fromTranslation(translation);
}); return zoomAll(stoeckach);
});
stoeckach.readyPromise.then(function(stoeckach){ stoeckach.readyPromise.then(function (stoeckach) {
stoeckach.style = new Cesium.Cesium3DTileStyle({ stoeckach.style = new Cesium.Cesium3DTileStyle({
color: "color('white',1)", color: "color('white',1)",
}) });
}); });
// load streamline data from text file and parse it to polyline with multiple colors. // load streamline data from text file and parse it to polyline with multiple colors.
......
public/index.html
+ 3
- 3
View file @ ccf308d4
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
<!-- <svg class="bd-placeholder-img card-img-top" width="100%" height="225" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: Thumbnail"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"/><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg> --> <!-- <svg class="bd-placeholder-img card-img-top" width="100%" height="225" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: Thumbnail"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"/><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg> -->
<img class="thumbimg" src="imgs/thumbnails/Kirchturm.JPG" alt=""> <img class="thumbimg" src="imgs/thumbnails/Kirchturm.JPG" alt="">
<div class="card-body"> <div class="card-body">
<p class="card-text">Visualisation of wind around three target buildings (black) near a church with spire and surrounded by numerous building layers (colors). The streamlines results from a Computational Fluid Dynamic simulation of the air flow with RANS (Reynold-Averaged Navier Stokes Equations) and the k-omega SST Turbulence model.</p> <p class="card-text">Visualisation of wind around three target buildings (red) near a church with spire and surrounded by numerous building layers (colors). The streamlines results from a Computational Fluid Dynamic simulation of the air flow with RANS (Reynold-Averaged Navier Stokes Equations) and the k-omega SST Turbulence model.</p>
<!-- <small class="text-muted">9 mins</small> --> <!-- <small class="text-muted">9 mins</small> -->
</div> </div>
<div class="d-flex justify-content-between align-items-center btnGroupDiv"> <div class="d-flex justify-content-between align-items-center btnGroupDiv">
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<!-- <svg class="bd-placeholder-img card-img-top" width="100%" height="225" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: Thumbnail"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"/><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg> --> <!-- <svg class="bd-placeholder-img card-img-top" width="100%" height="225" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: Thumbnail"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"/><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg> -->
<img class="thumbimg" src="imgs/thumbnails/Kirchturm1.JPG" alt=""> <img class="thumbimg" src="imgs/thumbnails/Kirchturm1.JPG" alt="">
<div class="card-body"> <div class="card-body">
<p class="card-text">Wind visualisation with particles around three target buildings (black) near a church with spire and surrounded by numerous building layers (colors). The streamlines results from a Computational Fluid Dynamic simulation of the air flow with RANS (Reynold-Averaged Navier Stokes Equations) and the k-omega SST Turbulence model.</p> <p class="card-text">Wind visualisation with particles around three target buildings (red) near a church with spire and surrounded by numerous building layers (colors). The streamlines results from a Computational Fluid Dynamic simulation of the air flow with RANS (Reynold-Averaged Navier Stokes Equations) and the k-omega SST Turbulence model.</p>
<!-- <small class="text-muted">9 mins</small> --> <!-- <small class="text-muted">9 mins</small> -->
</div> </div>
<div class="d-flex justify-content-between align-items-center btnGroupDiv"> <div class="d-flex justify-content-between align-items-center btnGroupDiv">
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
<!-- <svg class="bd-placeholder-img card-img-top" width="100%" height="225" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: Thumbnail"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"/><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg> --> <!-- <svg class="bd-placeholder-img card-img-top" width="100%" height="225" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: Thumbnail"><title>Placeholder</title><rect width="100%" height="100%" fill="#55595c"/><text x="50%" y="50%" fill="#eceeef" dy=".3em">Thumbnail</text></svg> -->
<img class="thumbimg" src="imgs/thumbnails/Kirchturm2.JPG" alt=""> <img class="thumbimg" src="imgs/thumbnails/Kirchturm2.JPG" alt="">
<div class="card-body"> <div class="card-body">
<p class="card-text">Wind visualisation with particles around three target buildings (black) near a church with spire and surrounded by numerous building layers (colors). The streamlines results from a Computational Fluid Dynamic simulation of the air flow with RANS (Reynold-Averaged Navier Stokes Equations) and the k-omega SST Turbulence model.</p> <p class="card-text">Wind visualisation with particles around three target buildings (red) near a church with spire and surrounded by numerous building layers (colors). The streamlines results from a Computational Fluid Dynamic simulation of the air flow with RANS (Reynold-Averaged Navier Stokes Equations) and the k-omega SST Turbulence model.</p>
<!-- <small class="text-muted">9 mins</small> --> <!-- <small class="text-muted">9 mins</small> -->
</div> </div>
<div class="d-flex justify-content-between align-items-center btnGroupDiv"> <div class="d-flex justify-content-between align-items-center btnGroupDiv">
......
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