...

m-schuetz · Jan 11, 2021 · afc3bd5 · afc3bd5
1 parent 84cfd61
commit afc3bd5
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 39 deletions.
diff --git a/modules/compute/scripts/bench_heidentor.js b/modules/compute/scripts/bench_heidentor.js
@@ -3,6 +3,7 @@
 if(typeof e4called === "undefined"){
 	e4called = true;
 
+	// let las = loadLASProgressive("D:/dev/pointclouds/illuscio/Bjorn Scan 12_30_19 Planar PC UHQ Cleaned.las");
 	let las = loadLASProgressive("D:/dev/pointclouds/archpro/heidentor.las");
 
 	let pc = new PointCloudProgressive("testcloud", "blabla");
@@ -80,17 +81,17 @@ if(typeof e4called === "undefined"){
 
 }
 
-// window.width = 1920;
-// window.height = 1080;
-// window.x = 0;
-// window.y = 0;
+window.width = 1920;
+window.height = 1080;
+window.x = 0;
+window.y = 0;
 
 view.set(
 	[-10.857, 3.839, -14.378],
 	[-7.709, 3.015, -13.759],
 );
 
-camera.fov = 100;
+camera.fov = 60;
 camera.near = 0.1;
 
 

diff --git a/modules/compute_hqs/resolve.cs b/modules/compute_hqs/resolve.cs
@@ -61,7 +61,7 @@ uvec4 rgbAt(int pixelID){
 		icolor = uvec4(255, 255, 255, 255);
 	}
 
-	icolor = uvec4(a, a, a, a) * 10;
+	// icolor = uvec4(a, a, a, a) * 5;
 	//icolor = uvec4(b, b, b, a);
 
 	return icolor;

diff --git a/modules/progressive/ProgressiveBINLoader.h b/modules/progressive/ProgressiveBINLoader.h
@@ -62,7 +62,7 @@ class BINLoader {
 			numPoints = size / 16;
 			//numPoints = numPoints > 400'000'000 ? 400'000'000 : numPoints;
 
-			//numPoints = 400'000'000;
+			//numPoints = 1'000'000'000;
 		}
 
 		createBinaryLoaderThread();

diff --git a/modules/progressive/eval/benchmark_heidentor_progressive.js b/modules/progressive/eval/benchmark_heidentor_progressive.js
@@ -80,7 +80,7 @@ window.y = 200;
 window.width = 1920;
 window.height = 1080;
 
-MSAA_SAMPLES = 4;
+MSAA_SAMPLES = 1;
 EDL_ENABLED = false;
 camera.near = 0.1;
 

diff --git a/modules/progressive/eval/benchmark_morro_bay.js b/modules/progressive/eval/benchmark_morro_bay.js
@@ -1,8 +1,8 @@
 
 if(!$("testcloud")){
 
-	//let las = loadLASProgressive("D:/dev/pointclouds/open_topography/ca13/morro_bay.las");
-	let las = loadBINProgressive("D:/dev/pointclouds/open_topography/ca13/morro_bay.bin");
+	let las = loadLASProgressive("D:/dev/pointclouds/open_topography/ca13/morro_bay.las");
+	//let las = loadBINProgressive("D:/dev/pointclouds/open_topography/ca13/morro_bay.bin");
 
 	let pc = new PointCloudProgressive("testcloud", "blabla");
 
@@ -84,7 +84,7 @@ window.y = 0;
 window.width = 1920;
 window.height = 1080;
 
-MSAA_SAMPLES = 4;
+MSAA_SAMPLES = 1;
 EDL_ENABLED = true;
 //renderDebug = renderPointCloudProgressive;
 //renderDebug = renderPointCloudBasic;

diff --git a/modules/progressive/eval/benchmark_morro_bay_1billion.js b/modules/progressive/eval/benchmark_morro_bay_1billion.js
@@ -4,7 +4,7 @@ if(!$("testcloud")){
 	//let las = loadBINProgressive("../../morro_bay.bin");
 	//let las = loadBINProgressive("../../morro_bay_1billion.bin");
 	let las = loadBINProgressive("D:/dev/pointclouds/open_topography/ca13/morro_bay.bin");
-	// let las = loadBINProgressive("D:/dev/pointclouds/open_topography/ca13/morro_bay_1billion.bin");
+	//let las = loadBINProgressive("D:/dev/pointclouds/open_topography/ca13/morro_bay_1billion.bin");
 
 	let pc = new PointCloudProgressive("testcloud", "blabla");
 
@@ -71,9 +71,16 @@ if(!$("testcloud")){
 
 }
 
+// 400 million
+// view.set(
+// 	[485.168, 1511.749, 21.458], 
+// 	[1535.947, 7.916, -1492.148]
+// );
+
+// 1 billion
 view.set(
-	[485.168, 1511.749, 21.458], 
-	[1535.947, 7.916, -1492.148]
+	[1103.3864793373828, 1862.5422015232878, -284.68769984102164],
+	[2898.295867829539, 69.99563809243493, -2463.8822418075906],
 );
 
 window.x = 0;
@@ -148,7 +155,7 @@ async function runTest(){
 		await sleep(1);
 
 		let progress = getDebugValue("pointcloud_progress");
-		log(`load progress: ${progress}`);
+		log(`load progress: ${progress}, time since start: ${now().toFixed(3)}s`);
 
 		if(progress === "100%"){
 			break;
@@ -243,7 +250,7 @@ async function runTest(){
 
 };
 
-runTest();
+//runTest();
 
 
 

diff --git a/modules/progressive/eval/benchmark_wien.js b/modules/progressive/eval/benchmark_wien.js
@@ -1,13 +1,14 @@
 
 if(!$("testcloud")){
 
+	let las = loadLASProgressive("F:/Lumnezia_bigger_pointcloud_colored_sk_vh.las");
 	//let las = loadLASProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_250M.las");
 	//let las = loadLASProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v7_250M.las");
 
 	//let las = loadBINProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_500M.bin");
-	let las = loadBINProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_250M.bin");
+	//let las = loadBINProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_250M.bin");
 
-	//let las = loadLASProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_125M.las");
+	// let las = loadLASProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_125M.las");
 	// let las = loadLASProgressive("D:/dev/pointclouds/tuwien_baugeschichte/arbegen_257.las");
 
 	let pc = new PointCloudProgressive("testcloud", "blabla");
@@ -75,10 +76,10 @@ if(!$("testcloud")){
 
 }
 
-view.set(
-	[342.979, 478.404, -49.588], 
-	[729.613, -101.396, -645.563]
-);
+// view.set(
+// 	[342.979, 478.404, -49.588], 
+// 	[729.613, -101.396, -645.563]
+// );
 
 window.x = 0;
 window.y = 0;
@@ -87,9 +88,10 @@ window.height = 1080;
 
 MSAA_SAMPLES = 1;
 EDL_ENABLED = false;
-GLTimerQueries.enabled = true;
+// GLTimerQueries.enabled = true;
 
 camera.near = 0.2;
+camera.far = 10000000;
 
 //renderDebug = renderPointCloudProgressive;
 //renderDebug = renderPointCloudBasic;
diff --git a/modules/progressive/eval/vr_wien.js b/modules/progressive/eval/vr_wien.js
@@ -1,7 +1,7 @@
 
 if(!$("testcloud")){
 
-	let las = loadLASProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_250M.las");
+	let las = loadLASProgressive("D:/dev/pointclouds/tu_photogrammetry/wienCity_v6_125M.las");
 
 	let pc = new PointCloudProgressive("testcloud", "blabla");
 

diff --git a/modules/progressive/fill.vs b/modules/progressive/fill.vs
@@ -53,6 +53,8 @@ void main() {
 
 	//vColor = aValue.xyz;
 
+	gl_PointSize = 1.0;
+
 	int vertexID = gl_VertexID + uOffset;
 	vVertexID = vec4(
 		float((vertexID >>  0) & 0xFF) / 255.0,

diff --git a/modules/progressive/reproject.fs b/modules/progressive/reproject.fs
@@ -9,8 +9,8 @@ in vec3 vColor;
 in vec4 vVertexID;
 
 void main() {
-	//out_color = vec4(1, 0, 0, 1);
 	out_color = vec4(vColor, 1.0);
+	// out_color = vec4(1, 0, 0, 1);
 	out_indices = vVertexID;
 }
 
diff --git a/modules/progressive/reproject.vs b/modules/progressive/reproject.vs
@@ -44,7 +44,7 @@ vec3 getColorFromV3(){
 void main() {
 
 	gl_Position = uWorldViewProj * vec4(aPosition, 1.0);
-	gl_PointSize = uPointSize;
+	gl_PointSize = 1.0;
 
 	if(uAttributeMode == ATT_MODE_VECTOR){
 		vColor = getColorFromV3();

diff --git a/modules/progressive/runtime/execute3.js b/modules/progressive/runtime/execute3.js
@@ -14,14 +14,14 @@
 // }
 
 
-// log(view.position);
+log(view.position);
 
-GLTimerQueries.enabled = true;
-//PROGRESSIVE_BUDGET = 10 * 1000 * 1000;
+// GLTimerQueries.enabled = true;
+// //PROGRESSIVE_BUDGET = 10 * 1000 * 1000;
 
-gl.disable(gl.POINT_SMOOTH);
-gl.disable(gl.PROGRAM_POINT_SIZE );
-gl.pointSize(1.0);
+// gl.disable(gl.POINT_SMOOTH);
+// gl.disable(gl.PROGRAM_POINT_SIZE );
+// gl.pointSize(1.0);
 
 //gl.pointSize(1.0);
 //log(gl.pointSize)
diff --git a/src_js/execute2.js b/src_js/execute2.js
@@ -295,7 +295,7 @@ if(typeof setAttribute !== "undefined"){
 	}
 
 
-	{ // for video
+	if(false){ // for video
 
 
 		attributeToggle = attributeToggle % 6;
@@ -330,6 +330,9 @@ if(typeof setAttribute !== "undefined"){
 
 	}
 
+	setAttribute([{name: "Scalar field #2", range: [0, 200]}]);
+	ATTRIBUTE_MODE = ATT_MODE_SCALAR;
+
 
 
 	// setAttribute([

diff --git a/src_js/render/render.js b/src_js/render/render.js
@@ -442,9 +442,9 @@ var renderBuffers = function(view, proj, target){
 				renderDebug(node, view, proj, target);
 			}else{
 			//renderComputeLL(node, view, proj, target);
-			//renderPointCloudCompute(node, view, proj, target);
-			//renderComputeHQS(node, view, proj, target);
-			renderPointCloudProgressive(node, view, proj, target);
+			// renderPointCloudCompute(node, view, proj, target);
+			renderComputeHQS(node, view, proj, target);
+			// renderPointCloudProgressive(node, view, proj, target);
 			//renderPointCloudBasic(node, view, proj, target);
 			//renderDefault(node, view, proj, target);
 			}

diff --git a/src_js/scripts/createDefaultScene.js b/src_js/scripts/createDefaultScene.js
@@ -102,8 +102,8 @@ view.lookAt(-0.8075575002596201, 1, -0.7614239455653012);
 //createDesktopMirror();
 createImageSpaceQuad();
 
-runJSFile(`${jsDir}/scripts/createSkybox.js`);
-runJSFile(`${jsDir}/scripts/createGround.js`);
+// runJSFile(`${jsDir}/scripts/createSkybox.js`);
+// runJSFile(`${jsDir}/scripts/createGround.js`);
 
 //runJSFile(`${jsDir}/scripts/createMethodLabels.js`);
 //runJSFile(`${jsDir}/scripts/createSpot.js`);

diff --git a/src_js/start.js b/src_js/start.js
@@ -79,7 +79,7 @@ runJSFile(`${jsDir}/scripts/createDefaultScene.js`);
 watchJS(`${jsDir}/update.js`);
 
 watchJS(`${jsDir}/execute.js`);
-watchJS(`${jsDir}/execute2.js`);
+// watchJS(`${jsDir}/execute2.js`);