diff options
Diffstat (limited to 'js/lib/geom/line.js')
-rwxr-xr-x | js/lib/geom/line.js | 89 |
1 files changed, 79 insertions, 10 deletions
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index a016d7a3..6555f6ae 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js | |||
@@ -1,7 +1,31 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | All Rights Reserved. |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | BSD License. |
5 | |||
6 | Redistribution and use in source and binary forms, with or without | ||
7 | modification, are permitted provided that the following conditions are met: | ||
8 | |||
9 | - Redistributions of source code must retain the above copyright notice, | ||
10 | this list of conditions and the following disclaimer. | ||
11 | - Redistributions in binary form must reproduce the above copyright | ||
12 | notice, this list of conditions and the following disclaimer in the | ||
13 | documentation and/or other materials provided with the distribution. | ||
14 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
15 | may be used to endorse or promote products derived from this software | ||
16 | without specific prior written permission. | ||
17 | |||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
25 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
26 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
28 | POSSIBILITY OF SUCH DAMAGE. | ||
5 | </copyright> */ | 29 | </copyright> */ |
6 | 30 | ||
7 | var GeomObj = require("js/lib/geom/geom-obj").GeomObj; | 31 | var GeomObj = require("js/lib/geom/geom-obj").GeomObj; |
@@ -63,8 +87,17 @@ exports.Line = Object.create(GeomObj, { | |||
63 | this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; | 87 | this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; |
64 | 88 | ||
65 | if(strokeMaterial) { | 89 | if(strokeMaterial) { |
66 | this._strokeMaterial = strokeMaterial; | 90 | this._strokeMaterial = strokeMaterial.dup(); |
67 | if (strokeColor && this._strokeMaterial.hasProperty( "color" )) this._strokeMaterial.setProperty( "color", this._strokeColor ); | 91 | } else { |
92 | this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup(); | ||
93 | } | ||
94 | |||
95 | if(strokeColor) { | ||
96 | if(this._strokeMaterial.hasProperty("color")) { | ||
97 | this._strokeMaterial.setProperty( "color", this._strokeColor ); | ||
98 | } else if (this._strokeMaterial && (this._strokeMaterial.gradientType === this._strokeColor.gradientMode)) { | ||
99 | this._strokeMaterial.setGradientData(this._strokeColor.color); | ||
100 | } | ||
68 | } | 101 | } |
69 | } | 102 | } |
70 | }, | 103 | }, |
@@ -413,12 +446,48 @@ exports.Line = Object.create(GeomObj, { | |||
413 | indices.push( index ); index++; | 446 | indices.push( index ); index++; |
414 | } | 447 | } |
415 | 448 | ||
416 | var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length); | ||
417 | |||
418 | var strokeMaterial = this.makeStrokeMaterial(); | 449 | var strokeMaterial = this.makeStrokeMaterial(); |
419 | 450 | // var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length); | |
420 | this._primArray.push( prim ); | 451 | // this._primArray.push( prim ); |
421 | this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); | 452 | // this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); |
453 | |||
454 | // refine the mesh for vertex deformations | ||
455 | if (strokeMaterial) | ||
456 | { | ||
457 | var primArray; | ||
458 | if (strokeMaterial.hasVertexDeformation()) | ||
459 | { | ||
460 | var paramRange = strokeMaterial.getVertexDeformationRange(); | ||
461 | var tolerance = strokeMaterial.getVertexDeformationTolerance(); | ||
462 | var nVertices = indices.length; | ||
463 | nVertices = ShapePrimitive.refineMesh( strokeVertices, strokeNormals, strokeTextures, indices, nVertices, paramRange, tolerance ); | ||
464 | var subdividedParts = ShapePrimitive.subdivideOversizedMesh( strokeVertices, strokeNormals, strokeTextures, indices ); | ||
465 | |||
466 | primArray = []; | ||
467 | if (subdividedParts) | ||
468 | { | ||
469 | for (var i=0; i<subdividedParts.length; i++) | ||
470 | { | ||
471 | var obj = subdividedParts[i]; | ||
472 | primArray.push( ShapePrimitive.create(obj.vertices, obj.normals, obj.uvs, obj.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, obj.vertices.length/3) ); | ||
473 | } | ||
474 | } | ||
475 | else | ||
476 | primArray = [ ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices) ]; | ||
477 | } | ||
478 | else | ||
479 | { | ||
480 | // create the RDGE primitive | ||
481 | primArray = [ ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length) ]; | ||
482 | } | ||
483 | |||
484 | var nPrims = primArray.length; | ||
485 | for (var i=0; i<nPrims; i++) | ||
486 | { | ||
487 | this._primArray.push( primArray[i] ); | ||
488 | this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); | ||
489 | } | ||
490 | } | ||
422 | 491 | ||
423 | world.updateObject(this); | 492 | world.updateObject(this); |
424 | } | 493 | } |