提交 26633fa1 编写于 作者: M Mr.doob

WebGLRenderer: Removed no longer used WebGLMaterials. See #7440.

上级 1cdc0957
......@@ -205,7 +205,6 @@ THREE.WebGLRenderer = function ( parameters ) {
var state = new THREE.WebGLState( _gl, extensions, paramThreeToGL );
var properties = new THREE.WebGLProperties();
var materialsCache = new THREE.WebGLMaterials();
var objects = new THREE.WebGLObjects( _gl, properties, this.info );
var programCache = new THREE.WebGLPrograms( this, capabilities );
......@@ -597,7 +596,7 @@ THREE.WebGLRenderer = function ( parameters ) {
function releaseMaterialProgramReference( material ) {
var programInfo = materialsCache.get( material ).program;
var programInfo = properties.get( material ).program;
material.program = undefined;
......@@ -1379,7 +1378,7 @@ THREE.WebGLRenderer = function ( parameters ) {
function initMaterial( material, lights, fog, object ) {
var materialProperties = materialsCache.get( material );
var materialProperties = properties.get( material );
var parameters = programCache.getParameters( material, lights, fog, object );
var code = programCache.getProgramCode( material, parameters );
......@@ -1498,6 +1497,8 @@ THREE.WebGLRenderer = function ( parameters ) {
material instanceof THREE.MeshPhysicalMaterial ||
material.lights ) {
// store the light setup it was created for
materialProperties.lightsHash = _lights.hash;
// wire up the material to this renderer's lighting state
......@@ -1545,7 +1546,7 @@ THREE.WebGLRenderer = function ( parameters ) {
_usedTextureUnits = 0;
var materialProperties = materialsCache.get( material );
var materialProperties = properties.get( material );
if ( materialProperties.program === undefined ) {
......
/**
* @author mrdoob / http://mrdoob.com/
*/
THREE.WebGLMaterials = function () {
var properties = {};
this.get = function ( material ) {
var uuid = material.uuid;
var map = properties[ uuid ];
if ( map === undefined ) {
map = {};
properties[ uuid ] = map;
}
return map;
};
this.delete = function ( object ) {
delete properties[ object.uuid ];
};
this.clear = function () {
properties = {};
};
};
......@@ -194,7 +194,6 @@
"src/renderers/webgl/WebGLExtensions.js",
"src/renderers/webgl/WebGLCapabilities.js",
"src/renderers/webgl/WebGLGeometries.js",
"src/renderers/webgl/WebGLMaterials.js",
"src/renderers/webgl/WebGLObjects.js",
"src/renderers/webgl/WebGLProgram.js",
"src/renderers/webgl/WebGLPrograms.js",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册