Merge pull request #1221 from pierotofy/shading2

Bump mapping, environment maps during texture render
OpenDroneMap · Aug 9, 2022 · 869d577 · 869d577
2 parents 3f901c0 + 0e3b2bf
commit 869d577
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 2 deletions.
diff --git a/app/static/app/js/vendor/MTLLoader.js b/app/static/app/js/vendor/MTLLoader.js
@@ -4,7 +4,7 @@
  * @author angelxuanchang
  */
 
-THREE.MTLLoader = function ( manager ) {
+ THREE.MTLLoader = function ( manager ) {
 
 	THREE.Loader.call( this, manager );
 
@@ -373,6 +373,7 @@ THREE.MTLLoader.MaterialCreator.prototype = {
 					// Diffuse texture map
 
 					setMapForType( "map", value );
+					setMapForType( "bumpMap", "-bm 0.025 " + value);
 
 					break;
 
@@ -458,7 +459,15 @@ THREE.MTLLoader.MaterialCreator.prototype = {
 
 		}
 
-		this.materials[ materialName ] = new THREE.MeshBasicMaterial( params );
+		const loader = new THREE.CubeTextureLoader();
+		loader.setPath( "/static/app/js/vendor/potree/envmaps/" );
+
+		textureCube = loader.load( [ 'px.jpg', 'nx.jpg', 'py.jpg', 'ny.jpg', 'pz.jpg', 'nz.jpg' ] );
+		textureCube.encoding = THREE.sRGBEncoding;
+
+		params.envMap = textureCube;
+
+		this.materials[ materialName ] = new THREE.MeshStandardMaterial( params );
 		return this.materials[ materialName ];
 
 	},

diff --git a/app/static/app/js/vendor/potree/envmaps/nx.jpg b/app/static/app/js/vendor/potree/envmaps/nx.jpg
diff --git a/app/static/app/js/vendor/potree/envmaps/ny.jpg b/app/static/app/js/vendor/potree/envmaps/ny.jpg
diff --git a/app/static/app/js/vendor/potree/envmaps/nz.jpg b/app/static/app/js/vendor/potree/envmaps/nz.jpg
diff --git a/app/static/app/js/vendor/potree/envmaps/px.jpg b/app/static/app/js/vendor/potree/envmaps/px.jpg
diff --git a/app/static/app/js/vendor/potree/envmaps/py.jpg b/app/static/app/js/vendor/potree/envmaps/py.jpg
diff --git a/app/static/app/js/vendor/potree/envmaps/pz.jpg b/app/static/app/js/vendor/potree/envmaps/pz.jpg