updated to accomodate east and west facing directions.

Signed-off-by: Nicholas Jerome <nicholas.jerome@kit.edu>

clean_bess_data.py

@@ -19,19 +19,24 @@ with open("./Development/data_toclean.txt", "r") as ins:
             elevation = int(infos[1])
             angle = int(infos[2][0:2])
 
+            direction = infos[2][-1]
+
             line8 = tmp[8].split(",")
             x_cur = float(line8[0].split("(")[1])
             z_cur = float(line8[1])
             y_cur = float(line8[2].split(")")[0])
 
             angle = 90 - angle
-            x = x_cur - (math.cos(math.radians(angle)) * (0.5 * math.cos(math.radians(elevation))))
+            if direction == "e":
+                x = x_cur - (math.cos(math.radians(angle)) * (0.5 * math.cos(math.radians(elevation))))
+            else:
+                x = x_cur + (math.cos(math.radians(angle)) * (0.5 * math.cos(math.radians(elevation))))
             y = y_cur - (math.sin(math.radians(angle)) * (0.5 * math.cos(math.radians(elevation))))
             z = (elevation / 15 * 0.1) + z_cur
 
 
             print x_cur, z_cur, y_cur
-            print new_name, elevation, angle
+            print new_name, elevation, angle, direction
             
             tmp[0] = " ".join(line1)
             line8_string = tmp[8]

index.html

@@ -2729,7 +2729,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv058a.position.set(-0.000, 0.9, -30.250);
+pv058a.position.set(0.000, 0.9, -30.250);
 pv058a.rotateY( Math.PI );
 pv058a.rotateX( 2 * Math.PI / 3);
 pv058a.name = "3A_60_00s_058_01";
@@ -2743,7 +2743,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv059a.position.set(7.875, 0.6, 25.033);
+pv059a.position.set(8.125, 0.6, 25.033);
 pv059a.rotateY( 11 * Math.PI / 12 );
 pv059a.rotateX( 11 * Math.PI / 12);
 pv059a.name = "3B_15_15w_059_01";
@@ -2757,7 +2757,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv060a.position.set(2.375, 0.6, 30.533);
+pv060a.position.set(2.625, 0.6, 30.533);
 pv060a.rotateY( 11 * Math.PI / 12 );
 pv060a.rotateX( 11 * Math.PI / 12);
 pv060a.name = "1B_15_15w_060_01";
@@ -2771,7 +2771,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv061a.position.set(9.375, 0.6, 35.033);
+pv061a.position.set(9.625, 0.6, 35.033);
 pv061a.rotateY( 11 * Math.PI / 12 );
 pv061a.rotateX( 11 * Math.PI / 12);
 pv061a.name = "4B_15_15w_061_01";
@@ -2785,7 +2785,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv062a.position.set(7.888, 0.7, 21.732);
+pv062a.position.set(8.112, 0.7, 21.732);
 pv062a.rotateY( 11 * Math.PI / 12 );
 pv062a.rotateX( 5 * Math.PI / 6);
 pv062a.name = "3A_30_15w_062_01";
@@ -2799,7 +2799,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv063a.position.set(12.388, 0.7, 22.832);
+pv063a.position.set(12.612, 0.7, 22.832);
 pv063a.rotateY( 11 * Math.PI / 12 );
 pv063a.rotateX( 5 * Math.PI / 6);
 pv063a.name = "1A_30_15w_063_01";
@@ -2813,7 +2813,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv064a.position.set(3.388, 0.7, 20.582);
+pv064a.position.set(3.612, 0.7, 20.582);
 pv064a.rotateY( 11 * Math.PI / 12 );
 pv064a.rotateX( 5 * Math.PI / 6);
 pv064a.name = "5A_30_15w_064_01";
@@ -2827,7 +2827,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv065a.position.set(15.908, 0.8, -19.342);
+pv065a.position.set(16.092, 0.8, -19.342);
 pv065a.rotateY( 11 * Math.PI / 12 );
 pv065a.rotateX( 3 * Math.PI / 4);
 pv065a.name = "3A_45_15w_065_01";
@@ -2841,7 +2841,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv066a.position.set(16.908, 0.8, -22.342);
+pv066a.position.set(17.092, 0.8, -22.342);
 pv066a.rotateY( 11 * Math.PI / 12 );
 pv066a.rotateX( 3 * Math.PI / 4);
 pv066a.name = "1A_45_15w_066_01";
@@ -2855,7 +2855,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv067a.position.set(14.908, 0.8, -15.342);
+pv067a.position.set(15.092, 0.8, -15.342);
 pv067a.rotateY( 11 * Math.PI / 12 );
 pv067a.rotateX( 3 * Math.PI / 4);
 pv067a.name = "4A_45_15w_067_01";
@@ -2869,7 +2869,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv068a.position.set(14.935, 0.9, -27.241);
+pv068a.position.set(15.065, 0.9, -27.241);
 pv068a.rotateY( 11 * Math.PI / 12 );
 pv068a.rotateX( 2 * Math.PI / 3);
 pv068a.name = "6A_60_15w_068_01";
@@ -2883,7 +2883,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv069a.position.set(19.935, 0.9, -25.991);
+pv069a.position.set(20.065, 0.9, -25.991);
 pv069a.rotateY( 11 * Math.PI / 12 );
 pv069a.rotateX( 2 * Math.PI / 3);
 pv069a.name = "3A_60_15w_069_01";
@@ -2897,7 +2897,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv070a.position.set(24.935, 0.9, -24.741);
+pv070a.position.set(25.065, 0.9, -24.741);
 pv070a.rotateY( 11 * Math.PI / 12 );
 pv070a.rotateX( 2 * Math.PI / 3);
 pv070a.name = "1A_60_15w_070_01";
@@ -2911,7 +2911,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv071a.position.set(16.759, 0.6, 24.582);
+pv071a.position.set(17.241, 0.6, 24.582);
 pv071a.rotateY( 11 * Math.PI / 6 );
 pv071a.rotateX( Math.PI / 12);
 pv071a.name = "3A_15_30w_071_01";
@@ -2925,7 +2925,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv072a.position.set(6.509, 0.6, 32.082);
+pv072a.position.set(6.991, 0.6, 32.082);
 pv072a.rotateY( 11 * Math.PI / 6 );
 pv072a.rotateX( Math.PI / 12);
 pv072a.name = "1A_15_30w_072_01";
@@ -2939,7 +2939,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv073a.position.set(10.259, 0.6, 37.832);
+pv073a.position.set(10.741, 0.6, 37.832);
 pv073a.rotateY( 11 * Math.PI / 6 );
 pv073a.rotateX( Math.PI / 12);
 pv073a.name = "1B_15_30w_073_01";
@@ -2953,7 +2953,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv074a.position.set(12.259, 0.6, 27.082);
+pv074a.position.set(12.741, 0.6, 27.082);
 pv074a.rotateY( 11 * Math.PI / 6 );
 pv074a.rotateX( Math.PI / 12);
 pv074a.name = "1D_15_30w_074_01";
@@ -2967,7 +2967,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv075a.position.set(7.259, 0.6, 29.082);
+pv075a.position.set(7.741, 0.6, 29.082);
 pv075a.rotateY( 11 * Math.PI / 6 );
 pv075a.rotateX( Math.PI / 12);
 pv075a.name = "1C_15_30w_075_01";
@@ -2980,7 +2980,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv076a.position.set(10.759, 0.6, 33.082);
+pv076a.position.set(11.241, 0.6, 33.082);
 pv076a.rotateY( 11 * Math.PI / 6 );
 pv076a.rotateX( Math.PI / 12);
 pv076a.name = "5D_15_30w_076_01";
@@ -2994,7 +2994,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv077a.position.set(12.783, 0.7, 11.625);
+pv077a.position.set(13.217, 0.7, 11.625);
 pv077a.rotateY( 11 * Math.PI / 6 );
 pv077a.rotateX( Math.PI / 6);
 pv077a.name = "6D_30_30w_077_01";
@@ -3008,7 +3008,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv078a.position.set(11.783, 0.7, 14.625);
+pv078a.position.set(12.217, 0.7, 14.625);
 pv078a.rotateY( 11 * Math.PI / 6 );
 pv078a.rotateX( Math.PI / 6);
 pv078a.name = "3D_30_30w_078_01";
@@ -3022,7 +3022,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv079a.position.set(13.783, 0.7, 8.625);
+pv079a.position.set(14.217, 0.7, 8.625);
 pv079a.rotateY( 11 * Math.PI / 6 );
 pv079a.rotateX( Math.PI / 6);
 pv079a.name = "1D_30_30w_079_01";
@@ -3036,7 +3036,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv080a.position.set(19.823, 0.8, -4.306);
+pv080a.position.set(20.177, 0.8, -4.306);
 pv080a.rotateY( 11 * Math.PI / 6 );
 pv080a.rotateX( Math.PI / 4);
 pv080a.name = "3A_45_30w_080_01";
@@ -3050,7 +3050,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv081a.position.set(20.823, 0.8, -7.306);
+pv081a.position.set(21.177, 0.8, -7.306);
 pv081a.rotateY( 11 * Math.PI / 6 );
 pv081a.rotateX( Math.PI / 4);
 pv081a.name = "1A_45_30w_081_01";
@@ -3064,7 +3064,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv082a.position.set(21.323, 0.8, -11.306);
+pv082a.position.set(21.677, 0.8, -11.306);
 pv082a.rotateY( 11 * Math.PI / 6 );
 pv082a.rotateX( Math.PI / 4);
 pv082a.name = "5A_45_30w_082_01";
@@ -3078,7 +3078,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv083a.position.set(23.875, 0.9, -21.217);
+pv083a.position.set(24.125, 0.9, -21.217);
 pv083a.rotateY( 11 * Math.PI / 6 );
 pv083a.rotateX( Math.PI / 3);
 pv083a.name = "6A_60_30w_083_01";
@@ -3092,7 +3092,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv084a.position.set(22.875, 0.9, -18.217);
+pv084a.position.set(23.125, 0.9, -18.217);
 pv084a.rotateY( 11 * Math.PI / 6 );
 pv084a.rotateX( Math.PI / 3);
 pv084a.name = "3A_60_30w_084_01";
@@ -3106,7 +3106,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv085a.position.set(22.875, 0.9, -14.217);
+pv085a.position.set(23.125, 0.9, -14.217);
 pv085a.rotateY( 11 * Math.PI / 6 );
 pv085a.rotateX( Math.PI / 3);
 pv085a.name = "1A_60_30w_085_01";
@@ -3120,7 +3120,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv086a.position.set(11.658, 0.6, 30.158);
+pv086a.position.set(12.342, 0.6, 30.158);
 pv086a.rotateY( 7 * Math.PI / 4 );
 pv086a.rotateX( Math.PI / 12);
 pv086a.name = "2A_15_45w_086_01";
@@ -3134,7 +3134,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv087a.position.set(15.658, 0.6, 30.158);
+pv087a.position.set(16.342, 0.6, 30.158);
 pv087a.rotateY( 7 * Math.PI / 4 );
 pv087a.rotateX( Math.PI / 12);
 pv087a.name = "1A_15_45w_087_01";
@@ -3148,7 +3148,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv088a.position.set(16.658, 0.6, 27.158);
+pv088a.position.set(17.342, 0.6, 27.158);
 pv088a.rotateY( 7 * Math.PI / 4 );
 pv088a.rotateX( Math.PI / 12);
 pv088a.name = "4A_15_45w_088_01";
@@ -3162,7 +3162,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv089a.position.set(19.694, 0.7, 10.694);
+pv089a.position.set(20.306, 0.7, 10.694);
 pv089a.rotateY( 7 * Math.PI / 4 );
 pv089a.rotateX( Math.PI / 6);
 pv089a.name = "6A_30_45w_089_01";
@@ -3176,7 +3176,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv090a.position.set(18.694, 0.7, 13.694);
+pv090a.position.set(19.306, 0.7, 13.694);
 pv090a.rotateY( 7 * Math.PI / 4 );
 pv090a.rotateX( Math.PI / 6);
 pv090a.name = "2A_30_45w_090_01";
@@ -3190,7 +3190,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv091a.position.set(28.750, 0.8, -14.250);
+pv091a.position.set(29.250, 0.8, -14.250);
 pv091a.rotateY( 7 * Math.PI / 4 );
 pv091a.rotateX( Math.PI / 4);
 pv091a.name = "2C_45_45w_091_01";
@@ -3204,7 +3204,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv092a.position.set(22.750, 0.8, 6.750);
+pv092a.position.set(23.250, 0.8, 6.750);
 pv092a.rotateY( 7 * Math.PI / 4 );
 pv092a.rotateX( Math.PI / 4);
 pv092a.name = "4C_45_45w_092_01";
@@ -3218,7 +3218,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv093a.position.set(29.823, 0.9, -18.177);
+pv093a.position.set(30.177, 0.9, -18.177);
 pv093a.rotateY( 7 * Math.PI / 4 );
 pv093a.rotateX( Math.PI / 3);
 pv093a.name = "6A_60_45w_093_01";
@@ -3232,7 +3232,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv094a.position.set(29.823, 0.9, -22.177);
+pv094a.position.set(30.177, 0.9, -22.177);
 pv094a.rotateY( 7 * Math.PI / 4 );
 pv094a.rotateX( Math.PI / 3);
 pv094a.name = "2A_60_45w_094_01";
@@ -3246,7 +3246,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv095a.position.set(14.582, 0.6, 33.759);
+pv095a.position.set(15.418, 0.6, 33.759);
 pv095a.rotateY( 5 * Math.PI / 3);
 pv095a.rotateX( Math.PI / 12);
 pv095a.name = "6A_15_60w_095_01";
@@ -3260,7 +3260,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv096a.position.set(13.582, 0.6, 36.759);
+pv096a.position.set(14.418, 0.6, 36.759);
 pv096a.rotateY( 5 * Math.PI / 3);
 pv096a.rotateX( Math.PI / 12);
 pv096a.name = "2A_15_60w_096_01";
@@ -3274,7 +3274,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv097a.position.set(15.625, 0.7, 19.783);
+pv097a.position.set(16.375, 0.7, 19.783);
 pv097a.rotateY( 5 * Math.PI / 3);
 pv097a.rotateX( Math.PI / 6);
 pv097a.name = "6A_30_60w_097_01";
@@ -3288,7 +3288,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv098a.position.set(16.625, 0.7, 16.783);
+pv098a.position.set(17.375, 0.7, 16.783);
 pv098a.rotateY( 5 * Math.PI / 3);
 pv098a.rotateX( Math.PI / 6);
 pv098a.name = "1A_30_60w_098_01";
@@ -3302,7 +3302,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv099a.position.set(24.694, 0.8, -1.177);
+pv099a.position.set(25.306, 0.8, -1.177);
 pv099a.rotateY( 5 * Math.PI / 3);
 pv099a.rotateX( Math.PI / 4);
 pv099a.name = "6A_45_60w_099_01";
@@ -3316,7 +3316,7 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv100a.position.set(21.694, 0.8, 1.823);
+pv100a.position.set(22.306, 0.8, 1.823);
 pv100a.rotateY( 5 * Math.PI / 3);
 pv100a.rotateX( Math.PI / 4);
 pv100a.name = "1A_45_60w_100_01";
@@ -3330,12 +3330,25 @@ specular: 0x050505,
 shininess: 100
 })
 );
-pv101a.position.set(27.783, 0.9, -10.125);
+pv101a.position.set(28.217, 0.9, -10.125);
 pv101a.rotateY( 5 * Math.PI / 3);
 pv101a.rotateX( Math.PI / 3);
 pv101a.name = "2C_60_60w_101_01";
 scene.add(pv101a);
 
+            pv102a = new THREE.Mesh(
+                new THREE.CubeGeometry( 4, 0.1,0.5),
+                new THREE.MeshPhongMaterial( {
+                    color: 0xD3D3D3,
+                    specular: 0x050505,
+                    shininess: 100
+                })
+            );
+            pv102a.position.set(26.216, 0.9, -6.125);
+            pv102a.rotateY( 5 * Math.PI / 3);
+	    pv102a.rotateX( Math.PI / 3);
+            pv102a.name = "1C_60_60w_102_01";
+            scene.add(pv102a);
 
             //scene.fog = new THREE.FogExp2( 0x000000, 0.0128 );
             //renderer.setClearColor( scene.fog.color, 1 );