From a7c2c048eb62bc0013a99ef8ea18455841e0d3c8 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 8 Oct 2014 13:21:33 +0200 Subject: [PATCH] Removed all remaining buffersNeedUpdate flags. --- docs/api/core/Geometry.html | 5 ---- editor/js/Sidebar.Material.js | 32 ----------------------- examples/webgl_objects_update.html | 2 -- src/core/Geometry.js | 1 - src/renderers/WebGLRenderer.js | 41 +++++++++++++++--------------- 5 files changed, 21 insertions(+), 60 deletions(-) diff --git a/docs/api/core/Geometry.html b/docs/api/core/Geometry.html index c363e436de..8e7a51c5b3 100644 --- a/docs/api/core/Geometry.html +++ b/docs/api/core/Geometry.html @@ -168,11 +168,6 @@
Set to *true* if the linedistances array has been updated.
- -

.[page:Boolean buffersNeedUpdate]

-
- Set to *true* if an array has changed in length. -

.[page:array lineDistances]

diff --git a/editor/js/Sidebar.Material.js b/editor/js/Sidebar.Material.js index f1c97cba3b..999e9f1b13 100644 --- a/editor/js/Sidebar.Material.js +++ b/editor/js/Sidebar.Material.js @@ -445,9 +445,6 @@ Sidebar.Material = function ( editor ) { if ( material.vertexColors !== undefined ) { - geometry.buffersNeedUpdate = true; - geometry.colorsNeedUpdate = true; - material.vertexColors = parseInt( materialVertexColors.getValue() ); material.needsUpdate = true; @@ -465,13 +462,6 @@ Sidebar.Material = function ( editor ) { if ( objectHasUvs ) { - if ( geometry !== undefined ) { - - geometry.buffersNeedUpdate = true; - geometry.uvsNeedUpdate = true; - - } - material.map = mapEnabled ? materialMap.getValue() : null; material.needsUpdate = true; @@ -489,13 +479,6 @@ Sidebar.Material = function ( editor ) { if ( objectHasUvs ) { - if ( geometry !== undefined ) { - - geometry.buffersNeedUpdate = true; - geometry.uvsNeedUpdate = true; - - } - material.alphaMap = mapEnabled ? materialAlphaMap.getValue() : null; material.needsUpdate = true; @@ -514,9 +497,6 @@ Sidebar.Material = function ( editor ) { if ( objectHasUvs ) { - geometry.buffersNeedUpdate = true; - geometry.uvsNeedUpdate = true; - material.lightMap = lightMapEnabled ? materialLightMap.getValue() : null; material.needsUpdate = true; @@ -535,9 +515,6 @@ Sidebar.Material = function ( editor ) { if ( objectHasUvs ) { - geometry.buffersNeedUpdate = true; - geometry.uvsNeedUpdate = true; - material.bumpMap = bumpMapEnabled ? materialBumpMap.getValue() : null; material.bumpScale = materialBumpScale.getValue(); material.needsUpdate = true; @@ -556,9 +533,6 @@ Sidebar.Material = function ( editor ) { if ( objectHasUvs ) { - geometry.buffersNeedUpdate = true; - geometry.uvsNeedUpdate = true; - material.normalMap = normalMapEnabled ? materialNormalMap.getValue() : null; material.needsUpdate = true; @@ -576,9 +550,6 @@ Sidebar.Material = function ( editor ) { if ( objectHasUvs ) { - geometry.buffersNeedUpdate = true; - geometry.uvsNeedUpdate = true; - material.specularMap = specularMapEnabled ? materialSpecularMap.getValue() : null; material.needsUpdate = true; @@ -596,9 +567,6 @@ Sidebar.Material = function ( editor ) { if ( objectHasUvs ) { - geometry.buffersNeedUpdate = true; - geometry.uvsNeedUpdate = true; - material.envMap = envMapEnabled ? materialEnvMap.getValue() : null; material.reflectivity = materialReflectivity.getValue(); material.needsUpdate = true; diff --git a/examples/webgl_objects_update.html b/examples/webgl_objects_update.html index 909ffbbdd0..86133f21ff 100644 --- a/examples/webgl_objects_update.html +++ b/examples/webgl_objects_update.html @@ -187,7 +187,6 @@ objectNewGeometry.geometry = createGeometry(1); - objectNewGeometry.geometry.buffersNeedUpdate = true; randomizeFaces(objectRandomizeFaces); scene.add(objectToggleAddRemove); @@ -199,7 +198,6 @@ if (scene.children.indexOf(objectToggleAddRemove) !== -1) { objectNewGeometry.geometry = createGeometry(1); - objectNewGeometry.geometry.buffersNeedUpdate = true; randomizeFaces(objectRandomizeFaces); scene.remove(objectToggleAddRemove); diff --git a/src/core/Geometry.js b/src/core/Geometry.js index 786f239d21..f1c1ac94a3 100644 --- a/src/core/Geometry.js +++ b/src/core/Geometry.js @@ -48,7 +48,6 @@ THREE.Geometry = function () { this.colorsNeedUpdate = false; this.lineDistancesNeedUpdate = false; - this.buffersNeedUpdate = false; this.groupsNeedUpdate = false; }; diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 28b43cbb38..b1cce64384 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -614,6 +614,7 @@ THREE.WebGLRenderer = function ( parameters ) { if ( geometry.__webglLineBuffer !== undefined ) _gl.deleteBuffer( geometry.__webglLineBuffer ); if ( geometry.__webglLineDistanceBuffer !== undefined ) _gl.deleteBuffer( geometry.__webglLineDistanceBuffer ); + // custom attributes if ( geometry.__webglCustomAttributesList !== undefined ) { @@ -3604,11 +3605,11 @@ THREE.WebGLRenderer = function ( parameters ) { } else if ( object instanceof THREE.Mesh ) { - initGeometryGroups(scene, object, geometry); + initGeometryGroups( scene, object, geometry ); } else if ( object instanceof THREE.Line ) { - if ( ! geometry.__webglVertexBuffer ) { + if ( geometry.__webglVertexBuffer === undefined ) { createLineBuffers( geometry ); initLineBuffers( geometry, object ); @@ -3621,7 +3622,7 @@ THREE.WebGLRenderer = function ( parameters ) { } else if ( object instanceof THREE.PointCloud ) { - if ( ! geometry.__webglVertexBuffer ) { + if ( geometry.__webglVertexBuffer === undefined ) { createParticleBuffers( geometry ); initParticleBuffers( geometry, object ); @@ -3637,6 +3638,8 @@ THREE.WebGLRenderer = function ( parameters ) { if ( object.__webglActive === undefined) { + object.__webglActive = true; + if ( object instanceof THREE.Mesh ) { if ( geometry instanceof THREE.BufferGeometry ) { @@ -3645,16 +3648,15 @@ THREE.WebGLRenderer = function ( parameters ) { } else if ( geometry instanceof THREE.Geometry ) { - for ( var i = 0,l = geometry.geometryGroupsList.length; i