Skip to content

Commit cf2e8c1

Browse files
alteredqalteredq
committed
Refactored everything to use CamelCase naming for properties. Plus some smaller fixes here and there.
Went through all examples, all should work. JSON files exported from Blender / converted from OBJ files still use underscored property names internally. I don't know, should these also be changed?
1 parent 1cb0a96 commit cf2e8c1

72 files changed

Lines changed: 755 additions & 842 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/Three.js‎

Lines changed: 99 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeCanvas.js‎

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeDOM.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeExtras.js‎

Lines changed: 21 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeSVG.js‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeWebGL.js‎

Lines changed: 57 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/canvas_materials.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
{ material: new THREE.MeshNormalMaterial(), overdraw: true, doubleSided: false },
8080
{ material: new THREE.MeshBasicMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ), overdraw: false, doubleSided: false },
8181
{ material: new THREE.MeshLambertMaterial( { map: ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ), overdraw: false, doubleSided: false },
82-
{ material: new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ) } ), overdraw: false, doubleSided: false }
82+
{ material: new THREE.MeshBasicMaterial( { envMap: ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ) } ), overdraw: false, doubleSided: false }
8383

8484
];
8585

‎examples/canvas_materials_reflection.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
geometry = new WaltHead();
6767
geometry.computeVertexNormals();
6868

69-
mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ) } ) );
69+
mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { envMap: ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ) } ) );
7070
mesh.overdraw = true;
7171
scene.addObject( mesh );
7272

‎examples/canvas_materials_video.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
imageContext.fillRect( 0, 0, 480, 204 );
8181

8282
texture = new THREE.Texture( image );
83-
texture.min_filter = THREE.LinearFilter;
84-
texture.mag_filter = THREE.LinearFilter;
83+
texture.minFilter = THREE.LinearFilter;
84+
texture.magFilter = THREE.LinearFilter;
8585

8686
var material = new THREE.MeshBasicMaterial( { map: texture } );
8787

@@ -98,8 +98,8 @@
9898
imageReflectionGradient.addColorStop( 1, 'rgba(240, 240, 240, 0.8)' );
9999

100100
textureReflection = new THREE.Texture( imageReflection );
101-
textureReflection.min_filter = THREE.LinearFilter;
102-
textureReflection.mag_filter = THREE.LinearFilter;
101+
textureReflection.minFilter = THREE.LinearFilter;
102+
textureReflection.magFilter = THREE.LinearFilter;
103103

104104
var materialReflection = new THREE.MeshBasicMaterial( { map: textureReflection } );
105105

‎examples/canvas_sandbox.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
objects = [];
167167

168168
geometry = new Sphere( 100, 16, 8 );
169-
material = new THREE.MeshBasicMaterial( { env_map: ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ) } );
169+
material = new THREE.MeshBasicMaterial( { envMap: ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ) } );
170170

171171
for ( var i = 0; i < 10; i ++ ) {
172172

0 commit comments

Comments
 (0)