Merge branch 'master' of ssh://git.breab.org:2223/kai/MasterArbeit

3_PointCloud/JoinedTowers/tilesetRaw.json

+{
+  "asset": {
+    "version": "0.0"
+  },
+  "geometricError": 0,
+  "root": {
+    "boundingVolume": {
+      "sphere": [
+            0,
+            0,
+            0,
+            5
+          ]
+    },
+    "geometricError": 0,
+    "refine": "add",
+    "children": [
+      {
+	    "transform": [
+			1.0, 0.0, 0.0, 0.0,
+			0.0, 1.0, 0.0, 50.0,
+			0.0, 0.0, 1.0, 0.0,
+			0.0, 0.0, 0.0, 1.0
+		  ],
+        "boundingVolume": {
+          "sphere": [
+            0,
+            0,
+            0,
+            5
+          ]
+        },
+        "geometricError": 0,
+        "content": {
+          "url": "example.pnts"
+        }
+      }
+    ]
+  }
+}

3_PointCloud/SeperateTowers/tilesetRaw.json

+{
+  "asset": {
+    "version": "0.0"
+  },
+  "geometricError": 0,
+  "root": {
+    "boundingVolume": {
+      "sphere": [
+            0,
+            0,
+            0,
+            5
+          ]
+    },
+    "geometricError": 0,
+    "refine": "add",
+    "children": [
+      {
+	    "transform": [
+			1.0, 0.0, 0.0, 0.0,
+			0.0, 1.0, 0.0, 50.0,
+			0.0, 0.0, 1.0, 0.0,
+			0.0, 0.0, 0.0, 1.0
+		  ],
+        "boundingVolume": {
+          "sphere": [
+            0,
+            0,
+            0,
+            5
+          ]
+        },
+        "geometricError": 0,
+        "content": {
+          "url": "example.pnts"
+        }
+      }
+    ]
+  }
+}

3_PointCloud/main.cpp

@@ -112,8 +112,8 @@ void convertTxtToPnts()
 			std::ifstream myfile;
 			char buffer[256];
 			 // make sure it's big enough
-			//snprintf(buffer, sizeof(buffer), "JoinedTowers/pnts_%06d.txt", i);
-			snprintf(buffer, sizeof(buffer), "SeperateTowers/pnts_%06d.txt", i);
+			snprintf(buffer, sizeof(buffer), "JoinedTowers/pnts_%06d.txt", i);
+			//snprintf(buffer, sizeof(buffer), "SeperateTowers/pnts_%06d.txt", i);
 			
 			myfile.open(buffer, std::ios::in);
 
@@ -141,8 +141,8 @@ void convertTxtToPnts()
 			myfile.close();
 		}
 
-		//writePTNS(pointsConvert, colorsConvert, "JoinedTowers/Cloud.pnts");
-		writePTNS(pointsConvert, colorsConvert, "SeperateTowers/Cloud.pnts");
+		writePTNS(pointsConvert, colorsConvert, "JoinedTowers/Cloud.pnts");
+		//writePTNS(pointsConvert, colorsConvert, "SeperateTowers/Cloud.pnts");
 
 	
 

Halterungen/vive 2.2.scad

@@ -16,7 +16,7 @@ module HohlZylinder(size=20, thickness = 5){
     difference() {
         cylinder(30,d = size,$fn=200);
         cylinder(25,d= size - 2*thickness,$fn=200);
-        cylinder(30,d = 6,$fn=40);
+        cylinder(30,d = 8,$fn=40);
     }
 }