Bladeren bron

Clean up.

Mr.doob 7 jaren geleden
bovenliggende
commit
e6de696ff0

+ 0 - 26
examples/obj/pointCloudBox/pointCloudBox.obj

@@ -1,26 +0,0 @@
-#                 Vertices: 8
-#                   Points: 0
-#                    Lines: 0
-#                    Faces: 6
-#                Materials: 1
-
-o 1
-
-# Vertex list
-
-v -0.5 -0.5 0.5
-v -0.5 -0.5 -0.5
-v -0.5 0.5 -0.5
-v -0.5 0.5 0.5
-v 0.5 -0.5 0.5
-v 0.5 -0.5 -0.5
-v 0.5 0.5 -0.5
-v 0.5 0.5 0.5
-
-# Point/Line/Face list
-
-usemtl Default
-
-p 1 2 3 4 5 6 7 8
-
-# End of file

+ 0 - 29
examples/obj/walt/WaltHead_bin.js

@@ -1,29 +0,0 @@
-{
-
-    "metadata" :
-    {
-        "formatVersion" : 3.1,
-        "sourceFile"    : "WaltHead.obj",
-        "generatedBy"   : "OBJConverter",
-        "vertices"      : 8146,
-        "faces"         : 16160,
-        "normals"       : 8146,
-        "uvs"           : 0,
-        "materials"     : 1
-    },
-
-    "materials": [	{
-	"DbgColor" : 15658734,
-	"DbgIndex" : 0,
-	"DbgName" : "lambert2SG.001",
-	"colorDiffuse" : [0.64, 0.64, 0.64],
-	"colorSpecular" : [0.25, 0.25, 0.25],
-	"illumination" : 2,
-	"opticalDensity" : 1.0,
-	"specularCoef" : 92.156863,
-	"opacity" : 1.0
-	}],
-
-    "buffers": "WaltHead_bin.bin"
-
-}

File diff suppressed because it is too large
+ 0 - 29
examples/obj/walt/WaltHead_slim.js


+ 9 - 3
examples/webgl_tiled_forward.html

@@ -32,6 +32,7 @@
 			Created by <a href="https://github.com/wizgrav" target="_blank" rel="noopener">wizgrav</a>.
 		</div>
 		<script src="../build/three.js"></script>
+		<script src="js/loaders/OBJLoader.js"></script>
 		<script src="js/controls/OrbitControls.js"></script>
 		<script src="js/postprocessing/EffectComposer.js"></script>
 		<script src="js/postprocessing/RenderPass.js"></script>
@@ -241,6 +242,7 @@
 
 			var sphereGeom = new THREE.SphereBufferGeometry( 0.5, 32, 32 );
 			var tIndex = Math.round( Math.random() * 3 );
+
 			Object.keys( Heads ).forEach( function ( t, index ) {
 
 				var g = new THREE.Group();
@@ -253,7 +255,6 @@
 					uniforms: THREE.UniformsUtils.clone( ml.uniforms ),
 					defines: conf.defines,
 					transparent: tIndex === index ? true : false,
-
 				} );
 
 				mtl.uniforms.opacity.value = tIndex === index ? 0.9 : 1;
@@ -279,7 +280,9 @@
 
 				mtl.defines[ 'TILED_FORWARD' ] = 1;
 				materials.push( mtl );
+
 				var obj = new THREE.Mesh( geom, mtl );
+				obj.position.y = - 37;
 				mtl.side = tIndex === index ? THREE.FrontSide : THREE.DoubleSide;
 
 				g.rotation.y = index * Math.PI / 2;
@@ -370,11 +373,14 @@
 
 		scene.onAfterRender = postEffect;
 
-		var loader = new THREE.JSONLoader();
+		var loader = new THREE.OBJLoader();
 
-		loader.load( './obj/walt/WaltHead_slim.js', function ( geometry ) {
+		loader.load( 'models/obj/walt/WaltHead.obj', function ( object ) {
+
+			var geometry = object.children[ 0 ].geometry;
 
 			window.addEventListener( 'resize', resize );
+
 			init( geometry );
 			resize();
 

Some files were not shown because too many files changed in this diff