rename the object renderers again

src/renderers/WebGLRenderer2.js

@@ -35,10 +35,10 @@ THREE.WebGLRenderer2 = function ( parameters ) {
 
 
 	var renderer = new THREE.WebGLRenderer2.LowLevelRenderer(parameters);
-	var meshRenderer = new THREE.WebGLRenderer2.MeshObjectRenderer(renderer, info);
-	var particleRenderer = new THREE.WebGLRenderer2.ParticleObjectRenderer(renderer, info);
-	var lineRenderer = new THREE.WebGLRenderer2.LineObjectRenderer(renderer, info);
-	var ribbonRenderer = new THREE.WebGLRenderer2.RibbonObjectRenderer(renderer, info);
+	var meshRenderer = new THREE.WebGLRenderer2.MeshRenderer(renderer, info);
+	var particleRenderer = new THREE.WebGLRenderer2.ParticleRenderer(renderer, info);
+	var lineRenderer = new THREE.WebGLRenderer2.LineRenderer(renderer, info);
+	var ribbonRenderer = new THREE.WebGLRenderer2.RibbonRenderer(renderer, info);
 	
 	var shaderBuilder = new THREE.WebGLRenderer2.ShaderBuilder(renderer, info);
 	

src/renderers/webgl/objects/LineObjectRenderer.js → src/renderers/webgl/objects/LineRenderer.js

@@ -1,13 +1,13 @@
 
 
-THREE.WebGLRenderer2.LineObjectRenderer = function(lowlevelrenderer, info){
+THREE.WebGLRenderer2.LineRenderer = function(lowlevelrenderer, info){
 	THREE.WebGLRenderer2.Object3DObjectRenderer.call( this, lowlevelrenderer, info );
 };
 
 
-THREE.WebGLRenderer2.LineObjectRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
+THREE.WebGLRenderer2.LineRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
 
-THREE.WebGLRenderer2.LineObjectRenderer.prototype.createBuffers = function( geometry ) {
+THREE.WebGLRenderer2.LineRenderer.prototype.createBuffers = function( geometry ) {
 	
 	var renderer = this.renderer;
 	geometry.__webglVertexBuffer = renderer.createBuffer();
@@ -17,7 +17,7 @@ THREE.WebGLRenderer2.LineObjectRenderer.prototype.createBuffers = function( geom
 	this.info.memory.geometries ++;
 };
 
-THREE.WebGLRenderer2.LineObjectRenderer.prototype.initBuffers = function( geometry, object ) {
+THREE.WebGLRenderer2.LineRenderer.prototype.initBuffers = function( geometry, object ) {
 
 	var nvertices = geometry.vertices.length;
 
@@ -31,7 +31,7 @@ THREE.WebGLRenderer2.LineObjectRenderer.prototype.initBuffers = function( geomet
 };
 
 
-THREE.WebGLRenderer2.LineObjectRenderer.prototype.setBuffers = function( geometry, object) {
+THREE.WebGLRenderer2.LineRenderer.prototype.setBuffers = function( geometry, object) {
 	
 	var renderer = this.renderer;
 	var v, c, d, vertex, offset, color,

src/renderers/webgl/objects/MeshObjectRenderer.js → src/renderers/webgl/objects/MeshRenderer.js

@@ -1,13 +1,13 @@
 
 
-THREE.WebGLRenderer2.MeshObjectRenderer = function(lowlevelrenderer, info){
+THREE.WebGLRenderer2.MeshRenderer = function(lowlevelrenderer, info){
 	THREE.WebGLRenderer2.Object3DObjectRenderer.call( this, lowlevelrenderer, info );
 };
 
 
-THREE.WebGLRenderer2.MeshObjectRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
+THREE.WebGLRenderer2.MeshRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
 
-THREE.WebGLRenderer2.MeshObjectRenderer.prototype.createBuffers = function( geometryGroup ) {
+THREE.WebGLRenderer2.MeshRenderer.prototype.createBuffers = function( geometryGroup ) {
 
 	var renderer = this.renderer;
 	geometryGroup.__webglVertexBuffer = renderer.createBuffer();
@@ -53,7 +53,7 @@ THREE.WebGLRenderer2.MeshObjectRenderer.prototype.createBuffers = function( geom
 
 };
 
-THREE.WebGLRenderer2.MeshObjectRenderer.prototype.initBuffers = function( geometryGroup, object ) {
+THREE.WebGLRenderer2.MeshRenderer.prototype.initBuffers = function( geometryGroup, object ) {
 
 	var geometry = object.geometry,
 		faces3 = geometryGroup.faces3,
@@ -207,7 +207,7 @@ THREE.WebGLRenderer2.MeshObjectRenderer.prototype.initBuffers = function( geomet
 
 
 
-THREE.WebGLRenderer2.MeshObjectRenderer.prototype.setBuffers = function( geometryGroup, object, dispose, material ) {
+THREE.WebGLRenderer2.MeshRenderer.prototype.setBuffers = function( geometryGroup, object, dispose, material ) {
 
 	if ( ! geometryGroup.__inittedArrays ) {
 

src/renderers/webgl/objects/Object3DObjectRenderer.js → src/renderers/webgl/objects/Object3DRenderer.js

@@ -1,11 +1,11 @@
 
 
-THREE.WebGLRenderer2.Object3DObjectRenderer = function(lowlevelrenderer, info){
+THREE.WebGLRenderer2.Object3DRenderer = function(lowlevelrenderer, info){
 	this.renderer = lowlevelrenderer;
 	this.info = info;
 };
 
-THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.getBufferMaterial = function( object, geometryGroup ) {
+THREE.WebGLRenderer2.Object3DRenderer.prototype.getBufferMaterial = function( object, geometryGroup ) {
 
 	return object.material instanceof THREE.MeshFaceMaterial
 		? object.material.materials[ geometryGroup.materialIndex ]
@@ -13,7 +13,7 @@ THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.getBufferMaterial = functi
 
 };
 
-THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.bufferGuessUVType = function( material ) {
+THREE.WebGLRenderer2.Object3DRenderer.prototype.bufferGuessUVType = function( material ) {
 
 	// material must use some texture to require uvs
 
@@ -27,7 +27,7 @@ THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.bufferGuessUVType = functi
 
 };
 
-THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.bufferGuessNormalType = function ( material ) {
+THREE.WebGLRenderer2.Object3DRenderer.prototype.bufferGuessNormalType = function ( material ) {
 
 	// only MeshBasicMaterial and MeshDepthMaterial don't need normals
 
@@ -49,14 +49,14 @@ THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.bufferGuessNormalType = fu
 
 };
 
-THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.materialNeedsSmoothNormals = function ( material ) {
+THREE.WebGLRenderer2.Object3DRenderer.prototype.materialNeedsSmoothNormals = function ( material ) {
 
 	return material && material.shading !== undefined && material.shading === THREE.SmoothShading;
 
 };
 
 
-THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.bufferGuessVertexColorType = function ( material ) {
+THREE.WebGLRenderer2.Object3DRenderer.prototype.bufferGuessVertexColorType = function ( material ) {
 
 	if ( material.vertexColors ) {
 
@@ -69,7 +69,7 @@ THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.bufferGuessVertexColorType
 };
 
 
-THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.initCustomAttributes = function( geometry, object ) {
+THREE.WebGLRenderer2.Object3DRenderer.prototype.initCustomAttributes = function( geometry, object ) {
 
 	var nvertices = geometry.vertices.length;
 
@@ -117,7 +117,7 @@ THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.initCustomAttributes = fun
 
 };
 
-THREE.WebGLRenderer2.Object3DObjectRenderer.prototype.numericalSort = function( a, b ) {
+THREE.WebGLRenderer2.Object3DRenderer.prototype.numericalSort = function( a, b ) {
 
 	return b[ 0 ] - a[ 0 ];
 

src/renderers/webgl/objects/ParticleObjectRenderer.js → src/renderers/webgl/objects/ParticleRenderer.js

@@ -1,12 +1,12 @@
 
 
-THREE.WebGLRenderer2.ParticleObjectRenderer = function(lowlevelrenderer, info){
+THREE.WebGLRenderer2.ParticleRenderer = function(lowlevelrenderer, info){
 	THREE.WebGLRenderer2.Object3DObjectRenderer.call( this, lowlevelrenderer, info );
 };
 
-THREE.WebGLRenderer2.ParticleObjectRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
+THREE.WebGLRenderer2.ParticleRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
 
-THREE.WebGLRenderer2.ParticleObjectRenderer.prototype.createBuffers = function( geometry ) {
+THREE.WebGLRenderer2.ParticleRenderer.prototype.createBuffers = function( geometry ) {
 	
 	var renderer = this.renderer;
 	geometry.__webglVertexBuffer = renderer.createBuffer();
@@ -15,7 +15,7 @@ THREE.WebGLRenderer2.ParticleObjectRenderer.prototype.createBuffers = function(
 	this.info.memory.geometries ++;
 };
 
-THREE.WebGLRenderer2.ParticleObjectRenderer.prototype.initBuffers = function( geometry, object ) {
+THREE.WebGLRenderer2.ParticleRenderer.prototype.initBuffers = function( geometry, object ) {
 
 	var nvertices = geometry.vertices.length;
 
@@ -31,7 +31,7 @@ THREE.WebGLRenderer2.ParticleObjectRenderer.prototype.initBuffers = function( ge
 };
 
 
-THREE.WebGLRenderer2.ParticleObjectRenderer.prototype.setBuffers = function( geometry, object , projectionScreenMatrix) {
+THREE.WebGLRenderer2.ParticleRenderer.prototype.setBuffers = function( geometry, object , projectionScreenMatrix) {
 
 	var renderer = this.renderer;
 	var v, c, vertex, offset, index, color,
@@ -56,8 +56,8 @@ THREE.WebGLRenderer2.ParticleObjectRenderer.prototype.setBuffers = function( geo
 	a, ca, cal, value,
 	customAttribute;
 	
-	var _projScreenMatrixPS = THREE.WebGLRenderer2.ParticleObjectRenderer._m1,
-		_vector3 = THREE.WebGLRenderer2.ParticleObjectRenderer._v1;
+	var _projScreenMatrixPS = THREE.WebGLRenderer2.ParticleRenderer._m1,
+		_vector3 = THREE.WebGLRenderer2.ParticleRenderer._v1;
 
 	if ( object.sortParticles ) {
 
@@ -354,5 +354,5 @@ THREE.WebGLRenderer2.ParticleObjectRenderer.prototype.setBuffers = function( geo
 
 };
 
-THREE.WebGLRenderer2.ParticleObjectRenderer._m1 = new THREE.Matrix4();
-THREE.WebGLRenderer2.ParticleObjectRenderer._v1 = new THREE.Vector3();
+THREE.WebGLRenderer2.ParticleRenderer._m1 = new THREE.Matrix4();
+THREE.WebGLRenderer2.ParticleRenderer._v1 = new THREE.Vector3();

src/renderers/webgl/objects/RibbonObjectRenderer.js → src/renderers/webgl/objects/RibbonRenderer.js

@@ -1,12 +1,12 @@
 
 
-THREE.WebGLRenderer2.RibbonObjectRenderer = function(lowlevelrenderer, info){
+THREE.WebGLRenderer2.RibbonRenderer = function(lowlevelrenderer, info){
 	THREE.WebGLRenderer2.Object3DObjectRenderer.call( this, lowlevelrenderer, info );
 };
 
-THREE.WebGLRenderer2.RibbonObjectRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
+THREE.WebGLRenderer2.RibbonRenderer.prototype = Object.create( THREE.WebGLRenderer2.Object3DObjectRenderer.prototype );
 
-THREE.WebGLRenderer2.RibbonObjectRenderer.prototype.createBuffers = function( geometry ) {
+THREE.WebGLRenderer2.RibbonRenderer.prototype.createBuffers = function( geometry ) {
 	
 	var renderer = this.renderer;
 	geometry.__webglVertexBuffer = renderer.createBuffer();
@@ -16,7 +16,7 @@ THREE.WebGLRenderer2.RibbonObjectRenderer.prototype.createBuffers = function( ge
 	this.info.memory.geometries ++;
 };
 
-THREE.WebGLRenderer2.RibbonObjectRenderer.prototype.initBuffers = function( geometry, object ) {
+THREE.WebGLRenderer2.RibbonRenderer.prototype.initBuffers = function( geometry, object ) {
 	
 	var nvertices = geometry.vertices.length;
 	
@@ -31,7 +31,7 @@ THREE.WebGLRenderer2.RibbonObjectRenderer.prototype.initBuffers = function( geom
 };
 
 
-THREE.WebGLRenderer2.RibbonObjectRenderer.prototype.setBuffers = function( geometry, object , projectionScreenMatrix) {
+THREE.WebGLRenderer2.RibbonRenderer.prototype.setBuffers = function( geometry, object , projectionScreenMatrix) {
 	
 	var renderer = this.renderer;
 	var v, c, n, vertex, offset, color, normal,

utils/includes/common.json

@@ -74,16 +74,16 @@
 	"../src/scenes/Fog.js",
 	"../src/scenes/FogExp2.js",
 	"../src/renderers/CanvasRenderer.js",
-	"../src/renderers/WebGLShaders.js",
 	"../src/renderers/WebGLRenderer.js",
+	"../src/renderers/WebGLShaders.js",
 	"../src/renderers/WebGLRenderer2.js",
 	"../src/renderers/webgl/LowLevelRenderer.js",
 	"../src/renderers/webgl/ShaderBuilder.js",
-	"../src/renderers/webgl/objects/Object3DObjectRenderer.js",
-	"../src/renderers/webgl/objects/MeshObjectRenderer.js",
-	"../src/renderers/webgl/objects/ParticleObjectRenderer.js",
-	"../src/renderers/webgl/objects/LineObjectRenderer.js",
-	"../src/renderers/webgl/objects/RibbonObjectRenderer.js",
+	"../src/renderers/webgl/objects/Object3DRenderer.js",
+	"../src/renderers/webgl/objects/MeshRenderer.js",
+	"../src/renderers/webgl/objects/ParticleRenderer.js",
+	"../src/renderers/webgl/objects/LineRenderer.js",
+	"../src/renderers/webgl/objects/RibbonRenderer.js",
 	"../src/renderers/WebGLRenderTarget.js",
 	"../src/renderers/WebGLRenderTargetCube.js",
 	"../src/renderers/renderables/RenderableVertex.js",