Skip to content

Commit 463f38c

Browse files
mrdoobmrdoob
committed
Merge pull request mrdoob#7155 from WestLangley/dev-cleanup
Clean Up
2 parents 484246a + 1d039ab commit 463f38c

File tree

3 files changed

+38
-40
lines changed

3 files changed

+38
-40
lines changed

‎examples/webgl_loader_collada_kinematics.html

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,10 @@
120120

121121
// Lights
122122

123-
var directionalLight = new THREE.HemisphereLight( 0xffeeee, 0x111122 );
124-
directionalLight.position.x = Math.random() - 0.5;
125-
directionalLight.position.y = Math.random() - 0.5;
126-
directionalLight.position.z = Math.random() - 0.5;
127-
directionalLight.position.normalize();
128-
scene.add( directionalLight );
129-
130-
var pointLight = new THREE.PointLight( 0xffffff, 0.5 );
123+
var light = new THREE.HemisphereLight( 0xffeeee, 0x111122 );
124+
scene.add( light );
125+
126+
var pointLight = new THREE.PointLight( 0xffffff, 0.3 );
131127
particleLight.add( pointLight );
132128

133129
renderer = new THREE.WebGLRenderer();
@@ -149,29 +145,29 @@
149145

150146
function setupTween() {
151147

152-
var duration = getRandomInt(1000, 5000);
148+
var duration = getRandomInt( 1000, 5000 );
153149

154150
var target = {};
155151

156-
for ( var i = 0; i < kinematics.joints.length; i++ ) {
152+
for ( var i = 0; i < kinematics.joints.length; i ++ ) {
157153

158-
var joint = kinematics.joints[ i ];
154+
var joint = kinematics.joints[ i ];
159155

160-
var old = tweenParameters[ i ];
156+
var old = tweenParameters[ i ];
161157

162-
var position = old ? old : joint.zeroPosition;
158+
var position = old ? old : joint.zeroPosition;
163159

164-
tweenParameters[ i ] = position;
160+
tweenParameters[ i ] = position;
165161

166-
target[ i ] = getRandomInt(joint.limits.min, joint.limits.max)
162+
target[ i ] = getRandomInt( joint.limits.min, joint.limits.max )
167163

168164
}
169165

170166
kinematicsTween = new TWEEN.Tween( tweenParameters ).to( target, duration ).easing( TWEEN.Easing.Quadratic.Out );
171167

172-
kinematicsTween.onUpdate(function() {
168+
kinematicsTween.onUpdate( function() {
173169

174-
for ( var i = 0; i < kinematics.joints.length; i++ ) {
170+
for ( var i = 0; i < kinematics.joints.length; i ++ ) {
175171

176172
kinematics.setJointValue( i, this[ i ] );
177173

@@ -229,7 +225,7 @@
229225

230226
function getRandomInt( min, max ) {
231227

232-
return Math.floor( Math.random() * ( max - min + 1 ) ) + min;
228+
return Math.floor( Math.random() * ( max - min + 1 ) ) + min;
233229

234230
}
235231

‎examples/webgl_loader_pdb.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
<div id="menu"></div>
7474

7575
<script>
76+
7677
var camera, scene, renderer, labelsRenderer;
7778
var controls;
7879

@@ -108,16 +109,16 @@
108109

109110
function init() {
110111

111-
camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 5000 );
112-
camera.position.z = 1500;
113-
114112
scene = new THREE.Scene();
115113

116-
var light = new THREE.HemisphereLight( 0xffffff, 0x000000 );
117-
light.position.set( 1, 1, 1 );
118-
scene.add( light );
114+
camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 5000 );
115+
camera.position.z = 1000;
116+
scene.add( camera );
117+
118+
var light = new THREE.PointLight( 0xffffff, 0.8 );
119+
camera.add( light );
119120

120-
root = new THREE.Object3D();
121+
root = new THREE.Group();
121122
scene.add( root );
122123

123124
//
@@ -138,8 +139,8 @@
138139
//
139140

140141
controls = new THREE.TrackballControls( camera, renderer.domElement );
141-
controls.rotateSpeed = 0.5;
142-
controls.addEventListener( 'change', render );
142+
controls.minDistance = 500;
143+
controls.maxDistance = 2000;
143144

144145
//
145146

@@ -184,7 +185,7 @@
184185

185186
function loadMolecule( url ) {
186187

187-
while( root.children.length > 0 ) {
188+
while ( root.children.length > 0 ) {
188189

189190
var object = root.children[ 0 ];
190191
object.parent.remove( object );
@@ -205,7 +206,7 @@
205206
var color = geometry.colors[ i ];
206207
var element = geometry.elements[ i ];
207208

208-
var material = new THREE.MeshLambertMaterial( { color: color } );
209+
var material = new THREE.MeshPhongMaterial( { color: color } );
209210

210211
var object = new THREE.Mesh( sphereGeometry, material );
211212
object.position.copy( position );
@@ -234,7 +235,7 @@
234235
start.multiplyScalar( 75 );
235236
end.multiplyScalar( 75 );
236237

237-
var object = new THREE.Mesh( boxGeometry, new THREE.MeshLambertMaterial( 0xffffff ) );
238+
var object = new THREE.Mesh( boxGeometry, new THREE.MeshPhongMaterial( 0xffffff ) );
238239
object.position.copy( start );
239240
object.position.lerp( end, 0.5 );
240241
object.scale.set( 5, 5, start.distanceTo( end ) );
@@ -250,7 +251,7 @@
250251
if ( xhr.lengthComputable ) {
251252

252253
var percentComplete = xhr.loaded / xhr.total * 100;
253-
console.log( Math.round(percentComplete, 2) + '% downloaded' );
254+
console.log( Math.round( percentComplete, 2 ) + '% downloaded' );
254255

255256
}
256257

@@ -295,7 +296,6 @@
295296

296297
}
297298

298-
</script>
299-
</body>
300-
299+
</script>
300+
</body>
301301
</html>

‎examples/webgl_shaders_ocean.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,15 @@
8484
camera.position.set( 2000, 750, 2000 );
8585

8686
controls = new THREE.OrbitControls( camera, renderer.domElement );
87-
controls.userPan = false;
88-
controls.userPanSpeed = 0.0;
87+
controls.enablePan = false;
88+
controls.minDistance = 1000.0;
8989
controls.maxDistance = 5000.0;
9090
controls.maxPolarAngle = Math.PI * 0.495;
9191
controls.center.set( 0, 500, 0 );
9292

93-
var light = new THREE.HemisphereLight( 0xffffbb, 0x080820, 1 );
93+
scene.add( new THREE.AmbientLight( 0x444444 ) );
94+
95+
var light = new THREE.DirectionalLight( 0xffffbb, 1 );
9496
light.position.set( - 1, 1, - 1 );
9597
scene.add( light );
9698

@@ -153,16 +155,16 @@
153155

154156
} );
155157

156-
var cubeShader = THREE.ShaderLib['cube'];
157-
cubeShader.uniforms['tCube'].value = cubeMap;
158+
var cubeShader = THREE.ShaderLib[ 'cube' ];
159+
cubeShader.uniforms[ 'tCube' ].value = cubeMap;
158160

159161
var skyBoxMaterial = new THREE.ShaderMaterial( {
160162
fragmentShader: cubeShader.fragmentShader,
161163
vertexShader: cubeShader.vertexShader,
162164
uniforms: cubeShader.uniforms,
163165
depthWrite: false,
164166
side: THREE.BackSide
165-
});
167+
} );
166168

167169
var skyBox = new THREE.Mesh(
168170
new THREE.BoxGeometry( 1000000, 1000000, 1000000 ),

0 commit comments

Comments
 (0)