Skip to content

Commit 25d6480

Browse files
mrdoobmrdoob
committedOct 1, 2011
Fixed yet more examples.
·
r52r45
1 parent 36ae044 commit 25d6480

12 files changed

+235
-333
lines changed
 

‎build/Three.js

+145-145
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeExtras.js

+45-45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeWebGL.js

+29-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/webgl_particles_random.html

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
document.body.appendChild( container );
6363

6464
camera = new THREE.Camera( 75, window.innerWidth / window.innerHeight, 1, 3000 );
65+
camera.useTarget = true;
6566
camera.position.z = 1000;
6667

6768
scene = new THREE.Scene();

‎examples/webgl_particles_sprites.html

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
document.body.appendChild( container );
6464

6565
camera = new THREE.Camera( 75, window.innerWidth / window.innerHeight, 1, 3000 );
66+
camera.useTarget = true;
6667
camera.position.z = 1000;
6768

6869
scene = new THREE.Scene();

‎examples/webgl_postprocessing_dof.html

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
document.body.appendChild( container );
7777

7878
camera = new THREE.Camera( 70, window.innerWidth / height, 1, 3000 );
79+
camera.useTarget = true;
7980
camera.position.z = 200;
8081

8182
scene = new THREE.Scene();

‎examples/webgl_ribbons.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
document.body.appendChild( container );
7878

7979
camera = new THREE.Camera( 70, window.innerWidth / window.innerHeight, 1, 3000 );
80+
camera.useTarget = true;
8081
camera.position.z = 1200;
8182

8283
scene = new THREE.Scene();
@@ -262,7 +263,7 @@
262263
var time = new Date().getTime() * 0.00005;
263264

264265
camera.position.x += ( mouseX - camera.position.x ) * 0.036;
265-
camera.position.y += ( - (mouseY) - camera.position.y ) * 0.036;
266+
camera.position.y += ( - mouseY - camera.position.y ) * 0.036;
266267

267268
for ( i = -n; i < n; i ++ ) {
268269

‎examples/webgl_rtt.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
cameraRTT.position.z = 100;
113113

114114
camera = new THREE.Camera( 30, window.innerWidth / window.innerHeight, 1, 10000 );
115+
camera.useTarget = true;
115116
camera.position.z = 100;
116-
camera.updateMatrix();
117117

118118
scene = new THREE.Scene();
119119
sceneRTT = new THREE.Scene();

‎examples/webgl_sandbox.html

+2-107
Original file line numberDiff line numberDiff line change
@@ -34,113 +34,7 @@
3434
<body>
3535
<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - webgl cube Fresnel shader demo.</div>
3636

37-
<!-- <script src="../build/Three.js"></script> -->
38-
39-
<script src="../src/Three.js"></script>
40-
<script src="../src/core/Color.js"></script>
41-
<script src="../src/core/Vector2.js"></script>
42-
<script src="../src/core/Vector3.js"></script>
43-
<script src="../src/core/Vector4.js"></script>
44-
<script src="../src/core/Ray.js"></script>
45-
<script src="../src/core/Rectangle.js"></script>
46-
<script src="../src/core/Matrix3.js"></script>
47-
<script src="../src/core/Matrix4.js"></script>
48-
<script src="../src/core/Object3D.js"></script>
49-
<script src="../src/core/Projector.js"></script>
50-
<script src="../src/core/Quaternion.js"></script>
51-
<script src="../src/core/Vertex.js"></script>
52-
<script src="../src/core/Face3.js"></script>
53-
<script src="../src/core/Face4.js"></script>
54-
<script src="../src/core/UV.js"></script>
55-
<script src="../src/core/Geometry.js"></script>
56-
<script src="../src/core/Spline.js"></script>
57-
<script src="../src/core/Edge.js"></script>
58-
<script src="../src/cameras/Camera.js"></script>
59-
<script src="../src/cameras/OrthoCamera.js"></script>
60-
<script src="../src/lights/Light.js"></script>
61-
<script src="../src/lights/AmbientLight.js"></script>
62-
<script src="../src/lights/DirectionalLight.js"></script>
63-
<script src="../src/lights/PointLight.js"></script>
64-
<script src="../src/lights/SpotLight.js"></script>
65-
<script src="../src/materials/Material.js"></script>
66-
<script src="../src/materials/LineBasicMaterial.js"></script>
67-
<script src="../src/materials/MeshBasicMaterial.js"></script>
68-
<script src="../src/materials/MeshLambertMaterial.js"></script>
69-
<script src="../src/materials/MeshPhongMaterial.js"></script>
70-
<script src="../src/materials/MeshDepthMaterial.js"></script>
71-
<script src="../src/materials/MeshNormalMaterial.js"></script>
72-
<script src="../src/materials/MeshFaceMaterial.js"></script>
73-
<script src="../src/materials/ShaderMaterial.js"></script>
74-
<script src="../src/materials/ParticleBasicMaterial.js"></script>
75-
<script src="../src/materials/ParticleCanvasMaterial.js"></script>
76-
<script src="../src/materials/ParticleDOMMaterial.js"></script>
77-
<script src="../src/textures/Texture.js"></script>
78-
<script src="../src/textures/DataTexture.js"></script>
79-
<script src="../src/objects/Particle.js"></script>
80-
<script src="../src/objects/ParticleSystem.js"></script>
81-
<script src="../src/objects/Line.js"></script>
82-
<script src="../src/objects/Mesh.js"></script>
83-
<script src="../src/objects/Bone.js"></script>
84-
<script src="../src/objects/SkinnedMesh.js"></script>
85-
<script src="../src/objects/Ribbon.js"></script>
86-
<script src="../src/objects/LOD.js"></script>
87-
<script src="../src/objects/Sprite.js"></script>
88-
<script src="../src/scenes/Scene.js"></script>
89-
<script src="../src/scenes/Fog.js"></script>
90-
<script src="../src/scenes/FogExp2.js"></script>
91-
<script src="../src/renderers/DOMRenderer.js"></script>
92-
<script src="../src/renderers/CanvasRenderer.js"></script>
93-
<script src="../src/renderers/SVGRenderer.js"></script>
94-
<script src="../src/renderers/WebGLShaders.js"></script>
95-
<script src="../src/renderers/WebGLRenderer.js"></script>
96-
<script src="../src/renderers/WebGLRenderTarget.js"></script>
97-
<script src="../src/renderers/WebGLRenderTargetCube.js"></script>
98-
<script src="../src/renderers/renderables/RenderableVertex.js"></script>
99-
<script src="../src/renderers/renderables/RenderableFace3.js"></script>
100-
<script src="../src/renderers/renderables/RenderableFace4.js"></script>
101-
<script src="../src/renderers/renderables/RenderableObject.js"></script>
102-
<script src="../src/renderers/renderables/RenderableParticle.js"></script>
103-
<script src="../src/renderers/renderables/RenderableLine.js"></script>
104-
<script src="../src/extras/ColorUtils.js"></script>
105-
<script src="../src/extras/GeometryUtils.js"></script>
106-
<script src="../src/extras/ImageUtils.js"></script>
107-
<script src="../src/extras/SceneUtils.js"></script>
108-
<script src="../src/extras/ShaderUtils.js"></script>
109-
<script src="../src/extras/core/Curve.js"></script>
110-
<script src="../src/extras/core/CurvePath.js"></script>
111-
<script src="../src/extras/core/Path.js"></script>
112-
<script src="../src/extras/core/Shape.js"></script>
113-
<script src="../src/extras/core/TextPath.js"></script>
114-
<script src="../src/extras/animation/AnimationHandler.js"></script>
115-
<script src="../src/extras/animation/Animation.js"></script>
116-
<script src="../src/extras/cameras/FirstPersonCamera.js"></script>
117-
<script src="../src/extras/cameras/PathCamera.js"></script>
118-
<script src="../src/extras/cameras/FlyCamera.js"></script>
119-
<script src="../src/extras/cameras/RollCamera.js"></script>
120-
<script src="../src/extras/cameras/TrackballCamera.js"></script>
121-
<script src="../src/extras/cameras/QuakeCamera.js"></script>
122-
<script src="../src/extras/geometries/CubeGeometry.js"></script>
123-
<script src="../src/extras/geometries/CylinderGeometry.js"></script>
124-
<script src="../src/extras/geometries/ExtrudeGeometry.js"></script>
125-
<script src="../src/extras/geometries/IcosahedronGeometry.js"></script>
126-
<script src="../src/extras/geometries/LatheGeometry.js"></script>
127-
<script src="../src/extras/geometries/PlaneGeometry.js"></script>
128-
<script src="../src/extras/geometries/SphereGeometry.js"></script>
129-
<script src="../src/extras/geometries/TextGeometry.js"></script>
130-
<script src="../src/extras/geometries/TorusGeometry.js"></script>
131-
<script src="../src/extras/geometries/TorusKnotGeometry.js"></script>
132-
<script src="../src/extras/loaders/Loader.js"></script>
133-
<script src="../src/extras/loaders/BinaryLoader.js"></script>
134-
<script src="../src/extras/loaders/ColladaLoader.js"></script>
135-
<script src="../src/extras/loaders/JSONLoader.js"></script>
136-
<script src="../src/extras/loaders/SceneLoader.js"></script>
137-
<script src="../src/extras/loaders/UTF8Loader.js"></script>
138-
<script src="../src/extras/objects/MarchingCubes.js"></script>
139-
<script src="../src/extras/objects/Trident.js"></script>
140-
<script src="../src/extras/physics/Collisions.js"></script>
141-
<script src="../src/extras/physics/CollisionUtils.js"></script>
142-
<script src="../src/extras/renderers/AnaglyphWebGLRenderer.js"></script>
143-
<script src="../src/extras/renderers/CrosseyedWebGLRenderer.js"></script>
37+
<script src="../build/Three.js"></script>
14438

14539
<script src="js/ShaderExtras.js"></script>
14640

@@ -171,6 +65,7 @@
17165
document.body.appendChild( container );
17266

17367
camera = new THREE.Camera( 60, window.innerWidth / window.innerHeight, 1, 10000 );
68+
camera.useTarget = true;
17469
camera.position.z = 3200;
17570

17671
scene = new THREE.Scene();

‎examples/webgl_utf8loader.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
document.body.appendChild( container );
7272

7373
camera = new THREE.Camera( 20, SCREEN_WIDTH / SCREEN_HEIGHT, NEAR, FAR );
74+
camera.useTarget = true;
7475
camera.position.z = 800;
75-
camera.updateMatrix();
7676

7777
scene = new THREE.Scene();
7878
scene.fog = new THREE.Fog( 0x000000, 800, FAR );
@@ -81,10 +81,10 @@
8181
var path = "textures/cube/SwedishRoyalCastle/";
8282
var format = '.jpg';
8383
var urls = [
84-
path + 'px' + format, path + 'nx' + format,
85-
path + 'py' + format, path + 'ny' + format,
86-
path + 'pz' + format, path + 'nz' + format
87-
];
84+
path + 'px' + format, path + 'nx' + format,
85+
path + 'py' + format, path + 'ny' + format,
86+
path + 'pz' + format, path + 'nz' + format
87+
];
8888

8989
reflectionCube = THREE.ImageUtils.loadTextureCube( urls );
9090

‎src/extras/loaders/SceneLoader.js

+2
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,12 @@ THREE.SceneLoader.prototype = {
360360
if ( c.type == "perspective" ) {
361361

362362
camera = new THREE.Camera( c.fov, c.aspect, c.near, c.far );
363+
camera.useTarget = true;
363364

364365
} else if ( c.type == "ortho" ) {
365366

366367
camera = new THREE.Camera();
368+
camera.useTarget = true;
367369
camera.projectionMatrix = THREE.Matrix4.makeOrtho( c.left, c.right, c.top, c.bottom, c.near, c.far );
368370

369371
}

‎src/renderers/WebGLRenderer.js

+1
Original file line numberDiff line numberDiff line change
@@ -3488,6 +3488,7 @@ THREE.WebGLRenderer = function ( parameters ) {
34883488
if ( ! _cameraLight ) {
34893489

34903490
_cameraLight = new THREE.Camera( _this.shadowCameraFov, _this.shadowMapWidth / _this.shadowMapHeight, _this.shadowCameraNear, _this.shadowCameraFar );
3491+
_cameraLight.useTarget = true;
34913492

34923493
}
34933494

0 commit comments

Comments
 (0)
Please sign in to comment.