Skip to content

Commit 6d3f13f

Browse files
committed
#1356 Moved verify and separated point from line cube
1 parent 0e736ce commit 6d3f13f

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

examples/obj/verify/gulpfile.js renamed to examples/models/obj/verify/gulpfile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,14 @@ gulp.task( 'default', function( cb ){
237237

238238
pos[ 0 ] += 50;
239239
offsets[ 0 ] += 8;
240-
fs.appendFileSync( './verify.obj', '\n\n# Point/Line. Translated x:' + pos[ 0 ] );
240+
fs.appendFileSync( './verify.obj', '\n\n# Point. Translated x:' + pos[ 0 ] );
241241
fs.appendFileSync( './verify.obj', vobjCreateVertices( 10, pos ) );
242242
fs.appendFileSync( './verify.obj', '\np -8 -7 -6 -5 -4 -3 -2 -1\n' );
243+
244+
pos[ 0 ] += 50;
245+
offsets[ 0 ] += 8;
246+
fs.appendFileSync( './verify.obj', '\n\n# Line. Translated x:' + pos[ 0 ] );
247+
fs.appendFileSync( './verify.obj', vobjCreateVertices( 10, pos ) );
243248
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' );
244249

245250
pos[ 0 ] += 50;

examples/obj/verify/verify.html renamed to examples/models/obj/verify/verify.html

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@
7171
<div id="feedback"></div>
7272
</div>
7373

74-
<script src="../../js/Detector.js"></script>
75-
<script src="../../../build/three.js"></script>
76-
<script src="../../js/controls/TrackballControls.js"></script>
77-
<script src="../../js/loaders/MTLLoader.js"></script>
78-
<script src="../../js/loaders/OBJLoader.js"></script>
79-
<script src="../../js/libs/dat.gui.min.js"></script>
80-
81-
<script src="../../js/loaders/LoaderSupport.js"></script>
82-
<script src="../../js/loaders/OBJLoader2.js"></script>
74+
<script src="../../../js/Detector.js"></script>
75+
<script src="../../../../build/three.js"></script>
76+
<script src="../../../js/controls/TrackballControls.js"></script>
77+
<script src="../../../js/loaders/MTLLoader.js"></script>
78+
<script src="../../../js/loaders/OBJLoader.js"></script>
79+
<script src="../../../js/libs/dat.gui.min.js"></script>
80+
81+
<script src="../../../js/loaders/LoaderSupport.js"></script>
82+
<script src="../../../js/loaders/OBJLoader2.js"></script>
8383
<script>
8484

8585
'use strict';
@@ -160,6 +160,10 @@
160160

161161
objLoader2.setModelName( modelName );
162162
objLoader2.setMaterials( materials );
163+
var mats = objLoader2.builder.getMaterials();
164+
var defaultPointMaterial = mats[ 'defaultPointMaterial' ];
165+
defaultPointMaterial.sizeAttenuation = true;
166+
163167
objLoader2.getLogger().setDebug( true );
164168
objLoader2.load( './verify.obj', callbackOnLoad, null, null, null, false );
165169
};
File renamed without changes.

examples/obj/verify/verify.obj renamed to examples/models/obj/verify/verify.obj

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ usemtl purple
175175
f 50/7/4 54/8/4 55/9/4 51/10/4
176176

177177

178-
# Point/Line. Translated x:200
178+
# Point. Translated x:200
179179
v 190 60 10
180180
v 190 40 10
181181
v 210 40 10
@@ -186,10 +186,9 @@ v 210 40 -10
186186
v 210 60 -10
187187

188188
p -8 -7 -6 -5 -4 -3 -2 -1
189-
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
190189

191190

192-
# Line UV. Translated x:250
191+
# Line. Translated x:250
193192
v 240 60 10
194193
v 240 40 10
195194
v 260 40 10
@@ -198,5 +197,17 @@ v 240 60 -10
198197
v 240 40 -10
199198
v 260 40 -10
200199
v 260 60 -10
200+
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
201+
202+
203+
# Line UV. Translated x:300
204+
v 290 60 10
205+
v 290 40 10
206+
v 310 40 10
207+
v 310 60 10
208+
v 290 60 -10
209+
v 290 40 -10
210+
v 310 40 -10
211+
v 310 60 -10
201212

202213
l -8/-2 -7/-1 -6/-2 -5/-1

0 commit comments

Comments
 (0)