Skip to content

GitLab

Unverified Commit c5ea12ed authored by Mr.doob's avatar Mr.doob Committed by GitHub
Browse files
Options

Merge pull request #14319 from Mugen87/dev12 

SubdivisionModifier: Honor material indices
parents ba381af5 0e1af8c7
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
examples/js/modifiers/SubdivisionModifier.js
View file @ c5ea12ed
......@@ -36,7 +36,7 @@ THREE.SubdivisionModifier.prototype.modify = function ( geometry ) {
};
( function() {
( function () {
// Some constants
var WARNINGS = ! true; // Set to true for development
......@@ -98,7 +98,7 @@ THREE.SubdivisionModifier.prototype.modify = function ( geometry ) {
function generateLookups( vertices, faces, metaVertices, edges ) {
var i, il, face, edge;
var i, il, face;
for ( i = 0, il = vertices.length; i < il; i ++ ) {
......@@ -118,9 +118,9 @@ THREE.SubdivisionModifier.prototype.modify = function ( geometry ) {
}
function newFace( newFaces, a, b, c ) {
function newFace( newFaces, a, b, c, materialIndex ) {
newFaces.push( new THREE.Face3( a, b, c ) );
newFaces.push( new THREE.Face3( a, b, c, undefined, undefined, materialIndex ) );
}
......@@ -146,7 +146,7 @@ THREE.SubdivisionModifier.prototype.modify = function ( geometry ) {
var oldVertices, oldFaces, oldUvs;
var newVertices, newFaces, newUVs = [];
var n, l, i, il, j, k;
var n, i, il, j, k;
var metaVertices, sourceEdges;
// new stuff.
......@@ -346,10 +346,10 @@ THREE.SubdivisionModifier.prototype.modify = function ( geometry ) {
// create 4 faces.
newFace( newFaces, edge1, edge2, edge3 );
newFace( newFaces, face.a, edge1, edge3 );
newFace( newFaces, face.b, edge2, edge1 );
newFace( newFaces, face.c, edge3, edge2 );
newFace( newFaces, edge1, edge2, edge3, face.materialIndex );
newFace( newFaces, face.a, edge1, edge3, face.materialIndex );
newFace( newFaces, face.b, edge2, edge1, face.materialIndex );
newFace( newFaces, face.c, edge3, edge2, face.materialIndex );
// create 4 new uv's
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment