minor fixes

fd78b1d0 · Sven Schneider · 7c2ec3eb · fd78b1d0 · fd78b1d0
Commit fd78b1d0 authored 4 years ago by Sven Schneider
Hide whitespace changes
Inline Side-by-side

Showing

with 41 additions and 2 deletions
+41 -2
--- a/public/circData.js
+++ b/public/circData.js
@@ -68,6 +68,45 @@ $(function () {


 	const buildingHeightOffset = 60; //53
+
+
+	///////////////////// STOECKACH LOD 1
+
+	// var stoeckach = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({			
+	// 	url: 'buildingTiles/StoeckachLOD1/tileset.json',		
+	// 	show: true		
+	// }));
+
+	
+
+	// stoeckach.readyPromise.then(function (stoeckach) {
+
+	// 	var R = 0;      // roll
+	// 	var P = 0; 	 // pitch
+	// 	var Yaw = 0;		 // yaw
+	// 	var height = buildingHeightOffset;  
+	// 	var cartographic = Cesium.Cartographic.fromCartesian(stoeckach.boundingSphere.center);
+	// 	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());	
+		
+	// 	//var rotMat = new Cesium.Matrix3();
+	// 	var rotation = new Cesium.Matrix3.fromHeadingPitchRoll(new Cesium.HeadingPitchRoll(Yaw, P, R));
+		
+	// 	stoeckach.modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotation,translation);
+
+		
+	// 	return zoomAll(stoeckach);
+	// });
+
+	// stoeckach.readyPromise.then(function(stoeckach){
+	// 	stoeckach.style = new Cesium.Cesium3DTileStyle({
+	// 		color: "color('white',0.5)",
+	// 	}) 
+	// });
+
+
+
 	///////////////////////////// Target  //////////////////////////

 	var target_tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({			
@@ -346,7 +385,7 @@ d3.dsv(",", "results/polylines_circularData.csv").then(function(text) {
 		geometryInstances: new Cesium.GeometryInstance({
 		  geometry: new Cesium.PolylineGeometry({
 			positions: positions,
-			width: 5.0,
+			width: 10.0,
 			vertexFormat: Cesium.PolylineColorAppearance.VERTEX_FORMAT,
 			colors: colors,			
 			colorsPerVertex: true,

--- a/public/circularData.html
+++ b/public/circularData.html
@@ -27,7 +27,7 @@
 <body>
  <header>
    <img src="imgs/icity.png" class="titleFigure">
-    <h2> TP2.4 - Prototyp 4: Webbasierte Visualisierung von CFD Simulationsdaten </h2>
+    <h2> TP2.4 - Prototyp 5: Webbasierte Visualisierung von CFD Simulationsdaten </h2>
    

  </header>