浏览代码

#1356 Moved verify and separated point from line cube

Kai Salmen 7 年之前
父节点
当前提交
6d3f13f1df

+ 6 - 1
examples/obj/verify/gulpfile.js → examples/models/obj/verify/gulpfile.js

@@ -237,9 +237,14 @@ gulp.task( 'default', function( cb ){
 
 
 	pos[ 0 ] += 50;
 	pos[ 0 ] += 50;
 	offsets[ 0 ] += 8;
 	offsets[ 0 ] += 8;
-	fs.appendFileSync( './verify.obj', '\n\n# Point/Line. Translated x:' + pos[ 0 ] );
+	fs.appendFileSync( './verify.obj', '\n\n# Point. Translated x:' + pos[ 0 ] );
 	fs.appendFileSync( './verify.obj', vobjCreateVertices( 10, pos ) );
 	fs.appendFileSync( './verify.obj', vobjCreateVertices( 10, pos ) );
 	fs.appendFileSync( './verify.obj', '\np -8 -7 -6 -5 -4 -3 -2 -1\n' );
 	fs.appendFileSync( './verify.obj', '\np -8 -7 -6 -5 -4 -3 -2 -1\n' );
+
+	pos[ 0 ] += 50;
+	offsets[ 0 ] += 8;
+	fs.appendFileSync( './verify.obj', '\n\n# Line. Translated x:' + pos[ 0 ] );
+	fs.appendFileSync( './verify.obj', vobjCreateVertices( 10, pos ) );
 	fs.appendFileSync( './verify.obj', 'l -8 -7 -6 -5 -4 -3 -2 -1 -8 -5 -8 -4 -7 -6 -7 -3 -5 -1 -3 -2 -6 -2 -4 -1\n' );
 	fs.appendFileSync( './verify.obj', 'l -8 -7 -6 -5 -4 -3 -2 -1 -8 -5 -8 -4 -7 -6 -7 -3 -5 -1 -3 -2 -6 -2 -4 -1\n' );
 
 
 	pos[ 0 ] += 50;
 	pos[ 0 ] += 50;

+ 13 - 9
examples/obj/verify/verify.html → examples/models/obj/verify/verify.html

@@ -71,15 +71,15 @@
 			<div id="feedback"></div>
 			<div id="feedback"></div>
 		</div>
 		</div>
 
 
-		<script src="../../js/Detector.js"></script>
-		<script src="../../../build/three.js"></script>
-		<script src="../../js/controls/TrackballControls.js"></script>
-		<script src="../../js/loaders/MTLLoader.js"></script>
-		<script src="../../js/loaders/OBJLoader.js"></script>
-		<script src="../../js/libs/dat.gui.min.js"></script>
-
-		<script src="../../js/loaders/LoaderSupport.js"></script>
-		<script src="../../js/loaders/OBJLoader2.js"></script>
+		<script src="../../../js/Detector.js"></script>
+		<script src="../../../../build/three.js"></script>
+		<script src="../../../js/controls/TrackballControls.js"></script>
+		<script src="../../../js/loaders/MTLLoader.js"></script>
+		<script src="../../../js/loaders/OBJLoader.js"></script>
+		<script src="../../../js/libs/dat.gui.min.js"></script>
+
+		<script src="../../../js/loaders/LoaderSupport.js"></script>
+		<script src="../../../js/loaders/OBJLoader2.js"></script>
 		<script>
 		<script>
 
 
 			'use strict';
 			'use strict';
@@ -160,6 +160,10 @@
 
 
 						objLoader2.setModelName( modelName );
 						objLoader2.setModelName( modelName );
 						objLoader2.setMaterials( materials );
 						objLoader2.setMaterials( materials );
+						var mats = objLoader2.builder.getMaterials();
+						var defaultPointMaterial = mats[ 'defaultPointMaterial' ];
+						defaultPointMaterial.sizeAttenuation = true;
+
 						objLoader2.getLogger().setDebug( true );
 						objLoader2.getLogger().setDebug( true );
 						objLoader2.load( './verify.obj', callbackOnLoad, null, null, null, false );
 						objLoader2.load( './verify.obj', callbackOnLoad, null, null, null, false );
 					};
 					};

+ 0 - 0
examples/obj/verify/verify.mtl → examples/models/obj/verify/verify.mtl


+ 14 - 3
examples/obj/verify/verify.obj → examples/models/obj/verify/verify.obj

@@ -175,7 +175,7 @@ usemtl purple
 f 50/7/4 54/8/4 55/9/4 51/10/4
 f 50/7/4 54/8/4 55/9/4 51/10/4
 
 
 
 
-# Point/Line. Translated x:200
+# Point. Translated x:200
 v 190 60 10
 v 190 60 10
 v 190 40 10
 v 190 40 10
 v 210 40 10
 v 210 40 10
@@ -186,10 +186,9 @@ v 210 40 -10
 v 210 60 -10
 v 210 60 -10
 
 
 p -8 -7 -6 -5 -4 -3 -2 -1
 p -8 -7 -6 -5 -4 -3 -2 -1
-l -8 -7 -6 -5 -4 -3 -2 -1 -8 -5 -8 -4 -7 -6 -7 -3 -5 -1 -3 -2 -6 -2 -4 -1
 
 
 
 
-# Line UV. Translated x:250
+# Line. Translated x:250
 v 240 60 10
 v 240 60 10
 v 240 40 10
 v 240 40 10
 v 260 40 10
 v 260 40 10
@@ -198,5 +197,17 @@ v 240 60 -10
 v 240 40 -10
 v 240 40 -10
 v 260 40 -10
 v 260 40 -10
 v 260 60 -10
 v 260 60 -10
+l -8 -7 -6 -5 -4 -3 -2 -1 -8 -5 -8 -4 -7 -6 -7 -3 -5 -1 -3 -2 -6 -2 -4 -1
+
+
+# Line UV. Translated x:300
+v 290 60 10
+v 290 40 10
+v 310 40 10
+v 310 60 10
+v 290 60 -10
+v 290 40 -10
+v 310 40 -10
+v 310 60 -10
 
 
 l -8/-2 -7/-1 -6/-2 -5/-1
 l -8/-2 -7/-1 -6/-2 -5/-1