Finished object.properties to object.userData renaming.

examples/js/exporters/SceneExporter.js

@@ -143,7 +143,7 @@ THREE.SceneExporter.prototype = {
 
 		scene.traverse( function ( node ) {
 
-			if ( node instanceof THREE.Camera && node.properties.active ) {
+			if ( node instanceof THREE.Camera && node.userData.active ) {
 
 				activeCamera = node;
 

examples/js/renderers/WebGLDeferredRenderer.js

@@ -126,16 +126,16 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 			}
 
-			object.properties.colorMaterial = new THREE.MeshFaceMaterial( colorMaterials );
-			object.properties.normalDepthMaterial = new THREE.MeshFaceMaterial( normalDepthMaterials );
+			object.userData.colorMaterial = new THREE.MeshFaceMaterial( colorMaterials );
+			object.userData.normalDepthMaterial = new THREE.MeshFaceMaterial( normalDepthMaterials );
 
 		} else {
 
 			var deferredMaterials = createDeferredMaterials( object.material );
 
-			object.properties.colorMaterial = deferredMaterials.colorMaterial;
-			object.properties.normalDepthMaterial = deferredMaterials.normalDepthMaterial;
-			object.properties.transparent = deferredMaterials.transparent;
+			object.userData.colorMaterial = deferredMaterials.colorMaterial;
+			object.userData.normalDepthMaterial = deferredMaterials.normalDepthMaterial;
+			object.userData.transparent = deferredMaterials.transparent;
 
 		}
 
@@ -317,7 +317,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 	var updatePointLightProxy = function ( lightProxy ) {
 
-		var light = lightProxy.properties.originalLight;
+		var light = lightProxy.userData.originalLight;
 		var uniforms = lightProxy.material.uniforms;
 
 		// skip infinite pointlights
@@ -401,7 +401,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		// keep reference for color and intensity updates
 
-		meshLight.properties.originalLight = light;
+		meshLight.userData.originalLight = light;
 
 		// keep reference for size reset
 
@@ -417,7 +417,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 	var updateSpotLightProxy = function ( lightProxy ) {
 
-		var light = lightProxy.properties.originalLight;
+		var light = lightProxy.userData.originalLight;
 		var uniforms = lightProxy.material.uniforms;
 
 		var viewMatrix = camera.matrixWorldInverse;
@@ -478,7 +478,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		// keep reference for color and intensity updates
 
-		meshLight.properties.originalLight = light;
+		meshLight.userData.originalLight = light;
 
 		// keep reference for size reset
 
@@ -494,7 +494,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 	var updateDirectionalLightProxy = function ( lightProxy ) {
 
-		var light = lightProxy.properties.originalLight;
+		var light = lightProxy.userData.originalLight;
 		var uniforms = lightProxy.material.uniforms;
 
 		directionVS.getPositionFromMatrix( light.matrixWorld );
@@ -545,7 +545,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		// keep reference for color and intensity updates
 
-		meshLight.properties.originalLight = light;
+		meshLight.userData.originalLight = light;
 
 		// keep reference for size reset
 
@@ -561,7 +561,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 	var updateHemisphereLightProxy = function ( lightProxy ) {
 
-		var light = lightProxy.properties.originalLight;
+		var light = lightProxy.userData.originalLight;
 		var uniforms = lightProxy.material.uniforms;
 
 		directionVS.getPositionFromMatrix( light.matrixWorld );
@@ -611,7 +611,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		// keep reference for color and intensity updates
 
-		meshLight.properties.originalLight = light;
+		meshLight.userData.originalLight = light;
 
 		// keep reference for size reset
 
@@ -627,7 +627,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 	var updateAreaLightProxy = function ( lightProxy ) {
 
-		var light = lightProxy.properties.originalLight;
+		var light = lightProxy.userData.originalLight;
 		var uniforms = lightProxy.material.uniforms;
 
 		var modelMatrix = light.matrixWorld;
@@ -700,7 +700,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		// keep reference for color and intensity updates
 
-		meshLight.properties.originalLight = light;
+		meshLight.userData.originalLight = light;
 
 		// keep reference for size reset
 
@@ -748,7 +748,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 	var initDeferredProperties = function ( object ) {
 
-		if ( object.properties.deferredInitialized ) return;
+		if ( object.userData.deferredInitialized ) return;
 
 		if ( object.material ) initDeferredMaterials( object );
 
@@ -788,7 +788,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		}
 
-		object.properties.deferredInitialized = true;
+		object.userData.deferredInitialized = true;
 
 	};
 
@@ -798,13 +798,13 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		if ( object.material ) {
 
-			if ( object.properties.transparent ) {
+			if ( object.userData.transparent ) {
 
 				object.material = invisibleMaterial;
 
 			} else {
 
-				object.material = object.properties.colorMaterial;
+				object.material = object.userData.colorMaterial;
 
 			}
 
@@ -816,13 +816,13 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		if ( object.material ) {
 
-			if ( object.properties.transparent ) {
+			if ( object.userData.transparent ) {
 
 				object.material = invisibleMaterial;
 
 			} else {
 
-				object.material = object.properties.normalDepthMaterial;
+				object.material = object.userData.normalDepthMaterial;
 
 			}
 
@@ -933,7 +933,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 		if ( uniforms[ "matProjInverse" ] ) uniforms[ "matProjInverse" ].value = camera.projectionMatrixInverse;
 		if ( uniforms[ "matView" ] ) uniforms[ "matView" ].value = camera.matrixWorldInverse;
 
-		var originalLight = proxy.properties.originalLight;
+		var originalLight = proxy.userData.originalLight;
 
 		if ( originalLight ) {
 
@@ -969,18 +969,18 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		// setup deferred properties
 
-		if ( ! scene.properties.lightSceneProxy ) {
+		if ( ! scene.userData.lightSceneProxy ) {
 
-			scene.properties.lightSceneProxy = new THREE.Scene();
-			scene.properties.lightSceneFullscreen = new THREE.Scene();
+			scene.userData.lightSceneProxy = new THREE.Scene();
+			scene.userData.lightSceneFullscreen = new THREE.Scene();
 
 			var meshLight = createDeferredEmissiveLight();
-			scene.properties.lightSceneFullscreen.add( meshLight );
+			scene.userData.lightSceneFullscreen.add( meshLight );
 
 		}
 
-		lightSceneProxy = scene.properties.lightSceneProxy;
-		lightSceneFullscreen = scene.properties.lightSceneFullscreen;
+		lightSceneProxy = scene.userData.lightSceneProxy;
+		lightSceneFullscreen = scene.userData.lightSceneFullscreen;
 
 		passColor.camera = camera;
 		passNormalDepth.camera = camera;

examples/scenes/test_scene.js

@@ -16,7 +16,7 @@
 			"rotation" : [ 0, -0.3, 0 ],
 			"scale"	   : [ 1, 1, 1 ],
 			"visible"  : true,
-			"properties" : {
+			"userData" : {
 				"rotating" : true,
 				"rotateX"  : true,
 				"rotateY"  : true
@@ -246,7 +246,7 @@
 			"rotation" : [ 0, 0.5, 0 ],
 			"scale"	   : [ 12, 12, 12 ],
 			"visible"  : true,
-			"properties" : {
+			"userData" : {
 				"rotating" : true,
 				"rotateY"  : true
 			}

examples/webgl_loader_scene.html

@@ -307,7 +307,7 @@
 
 					result.scene.traverse( function ( object ) {
 
-						if ( object.properties.rotating === true ) {
+						if ( object.userData.rotating === true ) {
 
 							rotatingObjects.push( object );
 
@@ -479,8 +479,8 @@
 
 					var object = rotatingObjects[ i ];
 
-					if ( object.properties.rotateX ) object.rotation.x += 1 * delta;
-					if ( object.properties.rotateY ) object.rotation.y += 0.5 * delta;
+					if ( object.userData.rotateX ) object.rotation.x += 1 * delta;
+					if ( object.userData.rotateY ) object.rotation.y += 0.5 * delta;
 
 				}
 

examples/webgldeferred_animation.html

@@ -238,7 +238,7 @@
 					var meshAnim = new THREE.MorphAnimMesh( geometry, material );
 
 					meshAnim.duration = 3000;
-					meshAnim.properties.delta = -13;
+					meshAnim.userData.delta = -13;
 
 					meshAnim.scale.multiplyScalar( 50 );
 					meshAnim.position.set( 180, -48, -10 );
@@ -286,7 +286,7 @@
 					mesh.position.y = -geometry.boundingBox.min.y * s - 48;
 					mesh.position.z = 18;
 
-					mesh.properties.delta = 25;
+					mesh.userData.delta = 25;
 
 					scene.add( mesh );
 					skins.push( mesh );
@@ -451,7 +451,7 @@
 					var morph = morphs[ i ];
 					morph.updateAnimation( 1000 * delta );
 
-					morph.position.x += morph.properties.delta * delta;
+					morph.position.x += morph.userData.delta * delta;
 					if ( morph.position.x < -50 ) morph.position.x = 200;
 
 				}
@@ -464,7 +464,7 @@
 
 					var skin = skins[ i ];
 
-					skin.position.x += skin.properties.delta * delta;
+					skin.position.x += skin.userData.delta * delta;
 					if ( skin.position.x > 200 ) skin.position.x = -200;
 
 				}

src/loaders/SceneLoader.js

@@ -187,7 +187,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 						var reservedTypes = { "type": 1, "url": 1, "material": 1,
 											  "position": 1, "rotation": 1, "scale" : 1,
-											  "visible": 1, "children": 1, "properties": 1,
+											  "visible": 1, "children": 1, "userData": 1,
 											  "skin": 1, "morph": 1, "mirroredLoop": 1, "duration": 1 };
 
 						var loaderParameters = {};
@@ -461,12 +461,12 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 				if ( object ) {
 
-					if ( objJSON.properties !== undefined )  {
+					if ( objJSON.userData !== undefined )  {
 
-						for ( var key in objJSON.properties ) {
+						for ( var key in objJSON.userData ) {
 
-							var value = objJSON.properties[ key ];
-							object.properties[ key ] = value;
+							var value = objJSON.userData[ key ];
+							object.userData[ key ] = value;
 
 						}
 
@@ -682,7 +682,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 			}
 
-			ta.object.target.properties.targetInverse = ta.object;
+			ta.object.target.userData.targetInverse = ta.object;
 
 		}