Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

提交 bfdb10a8 编写于 作者: M Mr.doob
浏览文件
操作

Updated all examples so they use the renamed geometry classes.

上级 d46a1ee3
展开全部 隐藏空白更改
内联 并排
Showing with 752 addition and 1235 deletion
build/Three.js
浏览文件 @ bfdb10a8
此差异已折叠。
build/custom/ThreeExtras.js
浏览文件 @ bfdb10a8
此差异已折叠。
examples/canvas_camera_orthographic.html
浏览文件 @ bfdb10a8
......@@ -71,7 +71,7 @@
// Cubes
var geometry = new THREE.Cube( 50, 50, 50 );
var geometry = new THREE.CubeGeometry( 50, 50, 50 );
var material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading } );
for ( var i = 0; i < 100; i ++ ) {
......
examples/canvas_geometry_cube.html
浏览文件 @ bfdb10a8
......@@ -70,14 +70,14 @@
}
cube = new THREE.Mesh( new THREE.Cube( 200, 200, 200, 1, 1, 1, materials ), new THREE.MeshFaceMaterial() );
cube = new THREE.Mesh( new THREE.CubeGeometry( 200, 200, 200, 1, 1, 1, materials ), new THREE.MeshFaceMaterial() );
cube.position.y = 150;
cube.overdraw = true;
scene.addObject( cube );
// Plane
plane = new THREE.Mesh( new THREE.Plane( 200, 200 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0 } ) );
plane = new THREE.Mesh( new THREE.PlaneGeometry( 200, 200 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0 } ) );
plane.rotation.x = - 90 * ( Math.PI / 180 );
plane.overdraw = true;
scene.addObject( plane );
......
examples/canvas_geometry_earth.html
浏览文件 @ bfdb10a8
......@@ -63,12 +63,12 @@
scene = new THREE.Scene();
mesh = new THREE.Mesh( new THREE.Plane( 300, 300, 3, 3 ), new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/shadow.png' ) } ) );
mesh = new THREE.Mesh( new THREE.PlaneGeometry( 300, 300, 3, 3 ), new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/shadow.png' ) } ) );
mesh.position.y = - 250;
mesh.rotation.x = - 90 * Math.PI / 180;
scene.addObject(mesh);
mesh = new THREE.Mesh( new THREE.Sphere( 200, 20, 20 ), new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ) );
mesh = new THREE.Mesh( new THREE.SphereGeometry( 200, 20, 20 ), new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ) );
mesh.overdraw = true;
scene.addObject(mesh);
......
examples/canvas_geometry_hierarchy.html
浏览文件 @ bfdb10a8
......@@ -48,7 +48,7 @@
scene = new THREE.Scene();
var geometry = new THREE.Cube( 100, 100, 100 );
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
var material = new THREE.MeshNormalMaterial();
group = new THREE.Object3D();
......
examples/canvas_geometry_panorama.html
浏览文件 @ bfdb10a8
......@@ -76,7 +76,7 @@
];
mesh = new THREE.Mesh( new THREE.Cube( 300, 300, 300, 7, 7, 7, materials, true ), new THREE.MeshFaceMaterial() );
mesh = new THREE.Mesh( new THREE.CubeGeometry( 300, 300, 300, 7, 7, 7, materials, true ), new THREE.MeshFaceMaterial() );
mesh.overdraw = true;
scene.addObject( mesh );
......
examples/canvas_geometry_panorama_fisheye.html
浏览文件 @ bfdb10a8
......@@ -76,7 +76,7 @@
];
mesh = new THREE.Mesh( new THREE.Cube( 300, 300, 300, 7, 7, 7, materials, true ), new THREE.MeshFaceMaterial() );
mesh = new THREE.Mesh( new THREE.CubeGeometry( 300, 300, 300, 7, 7, 7, materials, true ), new THREE.MeshFaceMaterial() );
mesh.overdraw = true;
scene.addObject( mesh );
......
examples/canvas_geometry_terrain.html
浏览文件 @ bfdb10a8
......@@ -70,7 +70,7 @@
var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( generateTexture( data, 1024, 1024 ) ) } );
var quality = 16, step = 1024 / quality;
var plane = new THREE.Plane( 2000, 2000, quality - 1, quality - 1 );
var plane = new THREE.PlaneGeometry( 2000, 2000, quality - 1, quality - 1 );
for ( var i = 0, l = plane.vertices.length; i < l; i ++ ) {
......
examples/canvas_geometry_text.html
浏览文件 @ bfdb10a8
......@@ -78,7 +78,7 @@
}
var text3d = new THREE.Text( theText, {
var text3d = new THREE.TextGeometry( theText, {
size: 80,
height: 20,
......@@ -104,7 +104,7 @@
// Plane
plane = new THREE.Mesh( new THREE.Plane( 800, 800 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0, wireframe:true }) );
plane = new THREE.Mesh( new THREE.PlaneGeometry( 800, 800 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0, wireframe:true }) );
plane.rotation.x = - 90 * ( Math.PI / 180 );
plane.position.x = 0;
plane.overdraw = true;
......
examples/canvas_interactive_cubes.html
浏览文件 @ bfdb10a8
......@@ -49,7 +49,7 @@
scene = new THREE.Scene();
var geometry = new THREE.Cube( 100, 100, 100 );
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
for ( var i = 0; i < 10; i ++ ) {
......
examples/canvas_interactive_cubes_tween.html
浏览文件 @ bfdb10a8
......@@ -47,7 +47,7 @@
scene = new THREE.Scene();
var geometry = new THREE.Cube( 100, 100, 100 );
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
for ( var i = 0; i < 20; i ++ ) {
......
examples/canvas_interactive_voxelpainter.html
浏览文件 @ bfdb10a8
......@@ -73,7 +73,7 @@
projector = new THREE.Projector();
plane = new THREE.Mesh( new THREE.Plane( 1000, 1000, 20, 20 ), new THREE.MeshFaceMaterial() );
plane = new THREE.Mesh( new THREE.PlaneGeometry( 1000, 1000, 20, 20 ), new THREE.MeshFaceMaterial() );
plane.rotation.x = - 90 * Math.PI / 180;
scene.addObject( plane );
......@@ -145,7 +145,7 @@
var position = new THREE.Vector3().add( intersects[ 0 ].point, intersects[ 0 ].object.matrixRotationWorld.multiplyVector3( intersects[ 0 ].face.normal.clone() ) );
var voxel = new THREE.Mesh( new THREE.Cube( 50, 50, 50 ), [ new THREE.MeshLambertMaterial( { color: 0x00ff80, opacity: 1, shading: THREE.FlatShading } ), new THREE.MeshFaceMaterial() ] );
var voxel = new THREE.Mesh( new THREE.CubeGeometry( 50, 50, 50 ), [ new THREE.MeshLambertMaterial( { color: 0x00ff80, opacity: 1, shading: THREE.FlatShading } ), new THREE.MeshFaceMaterial() ] );
voxel.position.x = Math.floor( position.x / 50 ) * 50 + 25;
voxel.position.y = Math.floor( position.y / 50 ) * 50 + 25;
voxel.position.z = Math.floor( position.z / 50 ) * 50 + 25;
......
examples/canvas_materials.html
浏览文件 @ bfdb10a8
......@@ -65,7 +65,7 @@
// Spheres
var geometry = new THREE.Sphere( 100, 14, 7, false );
var geometry = new THREE.SphereGeometry( 100, 14, 7, false );
var materials = [
......
examples/canvas_materials_depth.html
浏览文件 @ bfdb10a8
......@@ -72,7 +72,7 @@
var material = new THREE.MeshDepthMaterial();
plane = new THREE.Mesh( new THREE.Plane( 1000, 1000, 10, 10 ), material );
plane = new THREE.Mesh( new THREE.PlaneGeometry( 1000, 1000, 10, 10 ), material );
plane.rotation.x = - 90 * ( Math.PI / 180 );
plane.position.y = - 100;
plane.doubleSided = true;
......@@ -80,7 +80,7 @@
// Spheres
geometry = new THREE.Cube( 100, 100, 100 );
geometry = new THREE.CubeGeometry( 100, 100, 100 );
material = new THREE.MeshDepthMaterial( { near: 1, far: 2000 } );
for (var i = 0; i < 20; i ++ ) {
......
examples/canvas_materials_video.html
浏览文件 @ bfdb10a8
......@@ -104,7 +104,7 @@
//
var plane = new THREE.Plane( 480, 204, 4, 4 );
var plane = new THREE.PlaneGeometry( 480, 204, 4, 4 );
mesh = new THREE.Mesh( plane, material );
mesh.scale.x = mesh.scale.y = mesh.scale.z = 1.5;
......
examples/canvas_performance.html
浏览文件 @ bfdb10a8
......@@ -74,7 +74,7 @@
// Spheres
geometry = new THREE.Sphere( 100, 26, 18 );
geometry = new THREE.SphereGeometry( 100, 26, 18 );
material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, opacity: 1 } );
for ( var i = 0; i < 20; i ++ ) {
......
examples/canvas_sandbox.html
浏览文件 @ bfdb10a8
......@@ -33,13 +33,13 @@
<script type="text/javascript" src="../src/core/UV.js"></script>
<script type="text/javascript" src="../src/core/Geometry.js"></script>
<script type="text/javascript" src="../src/core/Spline.js"></script>
<script type="text/javascript" src="../src/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/animation/Animation.js"></script>
<script type="text/javascript" src="../src/core/Edge.js"></script>
<script type="text/javascript" src="../src/cameras/Camera.js"></script>
<script type="text/javascript" src="../src/lights/Light.js"></script>
<script type="text/javascript" src="../src/lights/AmbientLight.js"></script>
<script type="text/javascript" src="../src/lights/DirectionalLight.js"></script>
<script type="text/javascript" src="../src/lights/PointLight.js"></script>
<script type="text/javascript" src="../src/lights/LensFlare.js"></script>
<script type="text/javascript" src="../src/materials/Material.js"></script>
<script type="text/javascript" src="../src/materials/Mappings.js"></script>
<script type="text/javascript" src="../src/materials/LineBasicMaterial.js"></script>
......@@ -50,12 +50,11 @@
<script type="text/javascript" src="../src/materials/MeshNormalMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshFaceMaterial.js"></script>
<script type="text/javascript" src="../src/materials/MeshShaderMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ShadowVolumeDynamicMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleCanvasMaterial.js"></script>
<script type="text/javascript" src="../src/materials/ParticleDOMMaterial.js"></script>
<script type="text/javascript" src="../src/materials/Texture.js"></script>
<script type="text/javascript" src="../src/materials/RenderTarget.js"></script>
<script type="text/javascript" src="../src/materials/Uniforms.js"></script>
<script type="text/javascript" src="../src/objects/Particle.js"></script>
<script type="text/javascript" src="../src/objects/ParticleSystem.js"></script>
<script type="text/javascript" src="../src/objects/Line.js"></script>
......@@ -65,6 +64,8 @@
<script type="text/javascript" src="../src/objects/Ribbon.js"></script>
<script type="text/javascript" src="../src/objects/Sound.js"></script>
<script type="text/javascript" src="../src/objects/LOD.js"></script>
<script type="text/javascript" src="../src/objects/ShadowVolume.js"></script>
<script type="text/javascript" src="../src/objects/Sprite.js"></script>
<script type="text/javascript" src="../src/scenes/Scene.js"></script>
<script type="text/javascript" src="../src/scenes/Fog.js"></script>
<script type="text/javascript" src="../src/scenes/FogExp2.js"></script>
......@@ -74,6 +75,7 @@
<script type="text/javascript" src="../src/renderers/SVGRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/WebGLShaders.js"></script>
<script type="text/javascript" src="../src/renderers/WebGLRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/WebGLRenderTarget.js"></script>
<script type="text/javascript" src="../src/renderers/SoundRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableVertex.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableFace3.js"></script>
......@@ -81,24 +83,37 @@
<script type="text/javascript" src="../src/renderers/renderables/RenderableObject.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableParticle.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableLine.js"></script>
<script type="text/javascript" src="../src/extras/ColorUtils.js"></script>
<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../src/extras/ShaderUtils.js"></script>
<script type="text/javascript" src="../src/extras/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/extras/animation/Animation.js"></script>
<script type="text/javascript" src="../src/extras/cameras/QuakeCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/PathCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Cube.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Cylinder.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Icosahedron.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Lathe.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Plane.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Torus.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnot.js"></script>
<script type="text/javascript" src="../src/extras/cameras/FlyCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/RollCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/TrackballCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CubeGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CylinderGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/IcosahedronGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/LatheGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/PlaneGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/SphereGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TextGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnotGeometry.js"></script>
<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
<script type="text/javascript" src="../src/extras/io/JSONLoader.js"></script>
<script type="text/javascript" src="../src/extras/io/BinaryLoader.js"></script>
<script type="text/javascript" src="../src/extras/io/SceneLoader.js"></script>
<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
<script type="text/javascript" src="../src/extras/objects/Trident.js"></script>
<script type="text/javascript" src="../src/extras/physics/Collisions.js"></script>
<script type="text/javascript" src="../src/extras/physics/CollisionUtils.js"></script>
<script type="text/javascript" src="../src/extras/renderers/AnaglyphWebGLRenderer.js"></script>
<script type="text/javascript" src="../src/extras/renderers/CrosseyedWebGLRenderer.js"></script>
<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......@@ -171,7 +186,7 @@
objects = [];
geometry = new THREE.Sphere( 100, 16, 8 );
geometry = new THREE.SphereGeometry( 100, 16, 8 );
material = new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ) } );
for ( var i = 0; i < 10; i ++ ) {
......
examples/misc_camera_path.html
浏览文件 @ bfdb10a8
......@@ -84,7 +84,7 @@
// world
var cube = new THREE.Cube( 20, 60, 20 );
var cube = new THREE.CubeGeometry( 20, 60, 20 );
cube.vertices[ 0 ].position.multiplyScalar( 0.01 );
cube.vertices[ 1 ].position.multiplyScalar( 0.01 );
......
examples/misc_camera_roll.html
浏览文件 @ bfdb10a8
......@@ -67,7 +67,7 @@
// world
var cube = new THREE.Cube( 20, 60, 20 );
var cube = new THREE.CubeGeometry( 20, 60, 20 );
cube.vertices[ 0 ].position.multiplyScalar( 0.01 );
cube.vertices[ 1 ].position.multiplyScalar( 0.01 );
......
examples/misc_camera_trackball.html
浏览文件 @ bfdb10a8
......@@ -84,7 +84,7 @@
// world
var cube = new THREE.Cube( 20, 60, 20 );
var cube = new THREE.CubeGeometry( 20, 60, 20 );
cube.vertices[ 0 ].position.multiplyScalar( 0.01 );
cube.vertices[ 1 ].position.multiplyScalar( 0.01 );
......
examples/misc_lights_test.html
浏览文件 @ bfdb10a8
......@@ -90,7 +90,7 @@
// Spheres
var geometry = new THREE.Sphere( 100, 16, 8 );
var geometry = new THREE.SphereGeometry( 100, 16, 8 );
var material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading } );
for ( var i = 0; i < 30; i ++ ) {
......
examples/misc_lookat.html
浏览文件 @ bfdb10a8
......@@ -64,10 +64,10 @@
scene = new THREE.Scene();
var geometry = new THREE.Cylinder( 3, 10, 0.1, 100 );
var geometry = new THREE.CylinderGeometry( 3, 10, 0.1, 100 );
var material = new THREE.MeshNormalMaterial( { shading: THREE.SmoothShading } );
target = new THREE.Mesh( new THREE.Sphere( 100, 20, 20 ), material );
target = new THREE.Mesh( new THREE.SphereGeometry( 100, 20, 20 ), material );
scene.addObject( target );
for ( var i = 0; i < 1000; i ++ ) {
......
examples/misc_materials_multimaterials.html
浏览文件 @ bfdb10a8
......@@ -96,7 +96,7 @@
// SPHERES
sphere = new THREE.Sphere( 100, 16, 8 );
sphere = new THREE.SphereGeometry( 100, 16, 8 );
for ( var i = 0; i < 10; i ++ ) {
......@@ -242,7 +242,7 @@
for ( var i = 0; i < materials.length; i ++ ) {
// material
mesh = new THREE.Mesh( new THREE.Plane( size, size ), materials[i] );
mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), materials[i] );
mesh.position.x = i * ( size + 5 ) - ( ( materials.length - 1 ) * ( size + 5 ) / 2 );
mesh.position.y = FLOOR + size / 2 + bottom;
mesh.position.z = -100;
......@@ -264,7 +264,7 @@
var xm = new THREE.MeshBasicMaterial( { map: new THREE.Texture( x ) } );
xm.map.needsUpdate = true;
mesh = new THREE.Mesh( new THREE.Plane( size, size ), xm );
mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), xm );
mesh.position.x = i * ( size + 5 ) - ( ( materials.length - 1 ) * ( size + 5 ) / 2 );
mesh.position.y = FLOOR + size / 2 + bottom;
mesh.position.z = - 99;
......
examples/misc_sound.html
浏览文件 @ bfdb10a8
......@@ -82,12 +82,12 @@
light.position.normalize();
scene.addLight( light );
var sphere = new THREE.Sphere( 20, 32, 16 );
var sphere = new THREE.SphereGeometry( 20, 32, 16 );
material_sphere1 = new THREE.MeshLambertMaterial( { color: 0xffaa00, shading: THREE.FlatShading } );
material_sphere2 = new THREE.MeshLambertMaterial( { color: 0xff2200, shading: THREE.FlatShading } );
var cube = new THREE.Cube( 5, 40, 5 );
var cube = new THREE.CubeGeometry( 5, 40, 5 );
var material_cube = new THREE.MeshLambertMaterial( { color: 0xffff00, shading: THREE.FlatShading } );
material_cube.color.setHSV( 0.1, 0.7, 1 );
......@@ -132,7 +132,7 @@
material_wireframe.color.setHSV( 0.1, 0.2, 0.25 );
var plane = new THREE.Plane( 1000, 1000, 100, 100 );
var plane = new THREE.PlaneGeometry( 1000, 1000, 100, 100 );
mesh = new THREE.Mesh( plane, material_wireframe );
mesh.position.y = 0.1;
mesh.rotation.x = -1.57;
......@@ -201,7 +201,7 @@
} );
postprocessing.quad = new THREE.Mesh( new THREE.Plane( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad.position.z = - 500;
postprocessing.scene.addObject( postprocessing.quad );
......
examples/misc_ubiquity_test.html
浏览文件 @ bfdb10a8
......@@ -84,30 +84,37 @@
<script type="text/javascript" src="../src/renderers/renderables/RenderableObject.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableParticle.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableLine.js"></script>
<script type="text/javascript" src="../src/extras/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/extras/animation/Animation.js"></script>
<script type="text/javascript" src="../src/extras/ColorUtils.js"></script>
<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../src/extras/ShaderUtils.js"></script>
<script type="text/javascript" src="../src/extras/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/extras/animation/Animation.js"></script>
<script type="text/javascript" src="../src/extras/cameras/QuakeCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/PathCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/FlyCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Cube.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Cylinder.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Icosahedron.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Lathe.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Plane.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Torus.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnot.js"></script>
<script type="text/javascript" src="../src/extras/cameras/RollCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/TrackballCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CubeGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CylinderGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/IcosahedronGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/LatheGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/PlaneGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/SphereGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TextGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnotGeometry.js"></script>
<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
<script type="text/javascript" src="../src/extras/io/JSONLoader.js"></script>
<script type="text/javascript" src="../src/extras/io/BinaryLoader.js"></script>
<script type="text/javascript" src="../src/extras/io/SceneLoader.js"></script>
<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
<script type="text/javascript" src="../src/extras/objects/Trident.js"></script>
<script type="text/javascript" src="../src/extras/physics/Collisions.js"></script>
<script type="text/javascript" src="../src/extras/physics/CollisionUtils.js"></script>
<script type="text/javascript" src="../src/extras/renderers/AnaglyphWebGLRenderer.js"></script>
<script type="text/javascript" src="../src/extras/renderers/CrosseyedWebGLRenderer.js"></script>
<script type="text/javascript" src="obj/Qrcode.js"></script>
......@@ -155,7 +162,7 @@
// CUBES
var cube = new THREE.Cube( 100, 100, 100 );
var cube = new THREE.CubeGeometry( 100, 100, 100 );
mesh = new THREE.Mesh( cube, new THREE.MeshBasicMaterial( { color: 0x0000ff, opacity: 0.5 } ) );
mesh.position.x = 500;
......@@ -174,7 +181,7 @@
// PLANE
mesh = new THREE.Mesh( new THREE.Plane( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
mesh = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
mesh.position.y = -500;
mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;
mesh.doubleSided = true;
......@@ -182,7 +189,7 @@
// CYLINDER
mesh = new THREE.Mesh( new THREE.Cylinder( 10, 20, 100, 200, - 50, - 20 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
mesh = new THREE.Mesh( new THREE.CylinderGeometry( 10, 20, 100, 200, - 50, - 20 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
mesh.position.x = -500;
mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;
scene.addObject( mesh );
......
examples/webgl_collisions_box.html
浏览文件 @ bfdb10a8
......@@ -87,8 +87,8 @@ function init() {
function createCube( s, p ) {
cube = new THREE.Mesh (
new THREE.Cube( s,s,s, 1,1,1 ),
new THREE.MeshLambertMaterial( { color: 0x003300 })
new THREE.CubeGeometry( s, s, s ),
new THREE.MeshLambertMaterial( { color: 0x003300 } )
);
cube.position = p;
......
examples/webgl_collisions_primitives.html
浏览文件 @ bfdb10a8
......@@ -85,22 +85,20 @@
//makeWall(-360);
//makeWall(-480);
plane = new THREE.Mesh(new THREE.Plane(30000, 30000, 10, 10), new THREE.MeshLambertMaterial({
color: 0x003300
}));
plane.position.y = -480;
plane.rotation.x = Math.PI / -2;
scene.addObject(plane);
geoms.push(plane);
var cplane = new THREE.PlaneCollider(plane.position, new THREE.Vector3(0, 1, 0));
plane = new THREE.Mesh( new THREE.PlaneGeometry( 30000, 30000, 10, 10 ), new THREE.MeshLambertMaterial( { color: 0x003300 } ) );
plane.position.y = - 480;
plane.rotation.x = Math.PI / - 2;
scene.addObject( plane );
geoms.push( plane );
var cplane = new THREE.PlaneCollider( plane.position, new THREE.Vector3( 0, 1, 0 ) );
cplane.mesh = plane;
THREE.Collisions.colliders.push(cplane);
THREE.Collisions.colliders.push( cplane );
stats = new Stats();
stats.domElement.style.position = 'absolute';
stats.domElement.style.top = '0px';
container.appendChild( stats.domElement );
stats = new Stats();
stats.domElement.style.position = 'absolute';
stats.domElement.style.top = '0px';
container.appendChild( stats.domElement );
container.onmousemove = onDocumentMouseMove;
animate();
......@@ -120,9 +118,7 @@
}
function createCube(s, p){
var cube = new THREE.Mesh(new THREE.Cube(s, s, s, 1, 1, 1), new THREE.MeshLambertMaterial({
color: 0x003300
}));
var cube = new THREE.Mesh(new THREE.CubeGeometry( s, s, s ), new THREE.MeshLambertMaterial( { color: 0x003300 } ) );
cube.position = p;
scene.addObject(cube);
geoms.push(cube);
......@@ -130,9 +126,7 @@
}
function createSphere(rad, p){
var sphere = new THREE.Mesh(new THREE.Sphere(rad, 10, 10), new THREE.MeshLambertMaterial({
color: 0x003300
}));
var sphere = new THREE.Mesh( new THREE.SphereGeometry( rad, 10, 10 ), new THREE.MeshLambertMaterial( { color: 0x003300 } ) );
sphere.position = p;
scene.addObject(sphere);
geoms.push(sphere);
......
examples/webgl_collisions_reaction.html
浏览文件 @ bfdb10a8
......@@ -73,10 +73,8 @@
scene = new THREE.Scene();
sphere = new THREE.Mesh(new THREE.Sphere(sphereSize, 10, 10), new THREE.MeshLambertMaterial({
color: 0xff0000
}));
scene.addObject(sphere);
sphere = new THREE.Mesh( new THREE.SphereGeometry( sphereSize, 10, 10 ), new THREE.MeshLambertMaterial( { color: 0xff0000 } ) );
scene.addObject( sphere );
renderer = new THREE.WebGLRenderer();
renderer.setSize(window.innerWidth, window.innerHeight);
......@@ -108,11 +106,10 @@
}
function createCube(sx, sy, sz, p, ry){
var cube = new THREE.Mesh(new THREE.Cube(sx, sy, sz, 1, 1, 1), new THREE.MeshLambertMaterial({
color: 0x003300//, wireframe: true
}));
var cube = new THREE.Mesh( new THREE.CubeGeometry( sx, sy, sz ), new THREE.MeshLambertMaterial( { color: 0x003300 } ) );
cube.position = p;
cube.rotation.y = ry;
cube.rotation.y = ry;
scene.addObject(cube);
THREE.Collisions.colliders.push( THREE.CollisionUtils.MeshOBB(cube) );
cubes.push(cube);
......
examples/webgl_collisions_terrain.html
浏览文件 @ bfdb10a8
......@@ -69,7 +69,7 @@ function init() {
ray.origin.y = 10000;
ray.direction = new THREE.Vector3(0, -1, 0);
sphere = new THREE.Mesh( new THREE.Sphere( sphereSize, 10, 10 ), new THREE.MeshLambertMaterial( { color: 0xff0000 } ) );
sphere = new THREE.Mesh( new THREE.SphereGeometry( sphereSize, 10, 10 ), new THREE.MeshLambertMaterial( { color: 0xff0000 } ) );
scene.addObject(sphere);
camera.target = sphere;
......
examples/webgl_collisions_trigger.html
浏览文件 @ bfdb10a8
......@@ -70,16 +70,14 @@
camera.position.x = 300;
camera.position.z = 0;
mouse2d = new THREE.Vector3(0, 0, 1);
mouse2d = new THREE.Vector3( 0, 0, 1 );
loader = new THREE.Loader(true);
loader = new THREE.Loader( true );
scene = new THREE.Scene();
sphere = new THREE.Mesh(new THREE.Sphere(sphereSize, 10, 10), new THREE.MeshLambertMaterial({
color: 0xff0000
}));
scene.addObject(sphere);
sphere = new THREE.Mesh( new THREE.SphereGeometry( sphereSize, 10, 10 ), new THREE.MeshLambertMaterial( { color: 0xff0000 } ) );
scene.addObject( sphere );
renderer = new THREE.WebGLRenderer();
renderer.setSize(window.innerWidth, window.innerHeight);
......@@ -105,9 +103,7 @@
}
function createCube(sx, sy, sz, p){
var cube = new THREE.Mesh(new THREE.Cube(sx, sy, sz, 1, 1, 1), new THREE.MeshLambertMaterial({
color: 0x003300//, wireframe: true
}));
var cube = new THREE.Mesh(new THREE.CubeGeometry( sx, sy, sz ), new THREE.MeshLambertMaterial( { color: 0x003300 } ) );
cube.position = p;
scene.addObject(cube);
THREE.Collisions.colliders.push( THREE.CollisionUtils.MeshOBB(cube) );
......
examples/webgl_flycamera_earth.html
浏览文件 @ bfdb10a8
......@@ -151,7 +151,7 @@
// planet
geometry = new THREE.Sphere( radius, 100, 50 );
geometry = new THREE.SphereGeometry( radius, 100, 50 );
geometry.computeTangents();
meshPlanet = new THREE.Mesh( geometry, materialNormalMap );
......@@ -344,7 +344,7 @@
postprocessing.materialFilm.uniforms.sIntensity.value = 0.75;
postprocessing.materialFilm.uniforms.sCount.value = 2048;
postprocessing.quad = new THREE.Mesh( new THREE.Plane( SCREEN_WIDTH, SCREEN_HEIGHT ), postprocessing.materialConvolution );
postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( SCREEN_WIDTH, SCREEN_HEIGHT ), postprocessing.materialConvolution );
postprocessing.quad.position.z = - 500;
postprocessing.scene.addObject( postprocessing.quad );
......
examples/webgl_geometries.html
浏览文件 @ bfdb10a8
......@@ -60,27 +60,27 @@
new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: true, opacity: 0.1 } )
];
objects[ 0 ] = object = new THREE.Mesh( new THREE.Cube( 100, 100, 100, 4, 4, 4 ), material );
objects[ 0 ] = object = new THREE.Mesh( new THREE.CubeGeometry( 100, 100, 100, 4, 4, 4 ), material );
object.position.x = - 200;
object.position.z = 200;
scene.addObject( object );
objects[ 1 ] = object = new THREE.Mesh( new THREE.Cylinder( 50, 25, 75, 100 ), material );
objects[ 1 ] = object = new THREE.Mesh( new THREE.CylinderGeometry( 50, 25, 75, 100 ), material );
object.position.z = 200;
scene.addObject( object );
objects[ 2 ] = object = new THREE.Mesh( new THREE.Icosahedron( 2 ), material );
objects[ 2 ] = object = new THREE.Mesh( new THREE.IcosahedronGeometry( 2 ), material );
object.position.x = 200;
object.position.z = 200;
object.scale.x = object.scale.y = object.scale.z = 75;
scene.addObject( object );
objects[ 3 ] = object = new THREE.Mesh( new THREE.Plane( 100, 100, 4, 4 ), material );
objects[ 3 ] = object = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100, 4, 4 ), material );
object.position.x = - 200;
scene.addObject( object );
objects[ 4 ] = object = new THREE.Mesh( new THREE.Sphere( 75, 20, 10 ), material );
objects[ 4 ] = object = new THREE.Mesh( new THREE.SphereGeometry( 75, 20, 10 ), material );
scene.addObject( object );
var points = [];
......@@ -91,16 +91,16 @@
}
objects[ 5 ] = object = new THREE.Mesh( new THREE.Lathe( points, 20 ), material );
objects[ 5 ] = object = new THREE.Mesh( new THREE.LatheGeometry( points, 20 ), material );
object.position.x = 200;
scene.addObject( object );
objects[ 6 ] = object = new THREE.Mesh( new THREE.Torus( 50, 20, 20, 20 ), material );
objects[ 6 ] = object = new THREE.Mesh( new THREE.TorusGeometry( 50, 20, 20, 20 ), material );
object.position.x = - 200;
object.position.z = - 200;
scene.addObject( object );
objects[ 7 ] = object = new THREE.Mesh( new THREE.TorusKnot( 50, 10, 50, 20 ), material );
objects[ 7 ] = object = new THREE.Mesh( new THREE.TorusKnotGeometry( 50, 10, 50, 20 ), material );
object.position.z = - 200;
scene.addObject( object );
......
examples/webgl_geometry_colors.html
浏览文件 @ bfdb10a8
......@@ -72,7 +72,7 @@
scene.addLight( light );
var shadowMaterial = new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/shadow.png' ) } );
var shadowGeo = new THREE.Plane( 300, 300, 1, 1 );
var shadowGeo = new THREE.PlaneGeometry( 300, 300, 1, 1 );
mesh = new THREE.Mesh( shadowGeo, shadowMaterial );
mesh.position.y = - 250;
......@@ -95,9 +95,9 @@
var color, f, f2, f3, p, n, vertexIndex,
geometry = new THREE.Icosahedron( 1 ),
geometry2 = new THREE.Icosahedron( 1 ),
geometry3 = new THREE.Icosahedron( 1 );
geometry = new THREE.IcosahedronGeometry( 1 ),
geometry2 = new THREE.IcosahedronGeometry( 1 ),
geometry3 = new THREE.IcosahedronGeometry( 1 );
for ( var i = 0; i < geometry.faces.length; i++ ) {
......
examples/webgl_geometry_dynamic.html
浏览文件 @ bfdb10a8
......@@ -89,7 +89,7 @@
camera.position.y = 200;
camera.target.position.y = camera.position.y;
geometry = new THREE.Plane( 20000, 20000, worldWidth - 1, worldDepth - 1 );
geometry = new THREE.PlaneGeometry( 20000, 20000, worldWidth - 1, worldDepth - 1 );
var i, j, il, jl;
......
examples/webgl_geometry_hierarchy.html
浏览文件 @ bfdb10a8
......@@ -49,7 +49,7 @@
scene = new THREE.Scene();
scene.fog = new THREE.Fog( 0xffffff, 1, 10000 );
var geometry = new THREE.Cube( 100, 100, 100 );
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
var material = new THREE.MeshNormalMaterial();
group = new THREE.Object3D();
......
examples/webgl_geometry_hierarchy2.html
浏览文件 @ bfdb10a8
......@@ -49,7 +49,7 @@
scene = new THREE.Scene();
scene.fog = new THREE.Fog( 0xffffff, 1, 10000 );
var geometry = new THREE.Cube( 100, 100, 100 );
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
var material = new THREE.MeshNormalMaterial();
var mesh = new THREE.Mesh( geometry, material );
......
examples/webgl_geometry_large_mesh.html
浏览文件 @ bfdb10a8
......@@ -131,7 +131,7 @@
scene.addLight( pointLight );
// light representation
sphere = new THREE.Sphere( 100, 16, 8, 1 );
sphere = new THREE.SphereGeometry( 100, 16, 8, 1 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: 0xffaa00 } ) );
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
lightMesh.position = pointLight.position;
......
examples/webgl_geometry_minecraft.html
浏览文件 @ bfdb10a8
......@@ -109,7 +109,7 @@
nx = ( i & 4 ) == 4;
pz = ( i & 2 ) == 2;
nz = ( i & 1 ) == 1;
cubes[ i ] = new THREE.Cube( 100, 100, 100, 1, 1, 1, materials, false, { px: px, nx: nx, py: true, ny: false, pz: pz, nz: nz } );
cubes[ i ] = new THREE.CubeGeometry( 100, 100, 100, 1, 1, 1, materials, false, { px: px, nx: nx, py: true, ny: false, pz: pz, nz: nz } );
}
......
examples/webgl_geometry_minecraft_ao.html
浏览文件 @ bfdb10a8
......@@ -371,7 +371,7 @@
sides = { px: px, nx: nx, py: true, ny: false, pz: pz, nz: nz };
cube = new THREE.Cube( 100, 100, 100, 1, 1, 1, materials, false, sides );
cube = new THREE.CubeGeometry( 100, 100, 100, 1, 1, 1, materials, false, sides );
// set UV tiles
......
examples/webgl_geometry_terrain.html
浏览文件 @ bfdb10a8
......@@ -83,7 +83,7 @@
camera.position.y = data[ worldHalfWidth + worldHalfDepth * worldWidth ] + 500;
camera.target.position.y = camera.position.y;
var geometry = new THREE.Plane( 7500, 7500, worldWidth - 1, worldDepth - 1 );
var geometry = new THREE.PlaneGeometry( 7500, 7500, worldWidth - 1, worldDepth - 1 );
for ( var i = 0, l = geometry.vertices.length; i < l; i ++ ) {
......
examples/webgl_geometry_terrain_fog.html
浏览文件 @ bfdb10a8
......@@ -83,7 +83,7 @@
camera.position.y = data[ worldHalfWidth + worldHalfDepth * worldWidth ] * 10 + 500;
camera.target.position.y = camera.position.y;
var geometry = new THREE.Plane( 7500, 7500, worldWidth - 1, worldDepth - 1 );
var geometry = new THREE.PlaneGeometry( 7500, 7500, worldWidth - 1, worldDepth - 1 );
for ( var i = 0, l = geometry.vertices.length; i < l; i ++ ) {
......
examples/webgl_geometry_text.html
浏览文件 @ bfdb10a8
此差异已折叠。
examples/webgl_hdr.html
浏览文件 @ bfdb10a8
......@@ -143,7 +143,7 @@
} );
var plane = new THREE.Plane( 512, 768 );
var plane = new THREE.PlaneGeometry( 512, 768 );
quad = new THREE.Mesh( plane, materialHDR );
quad.position.z = -100;
......
examples/webgl_interactive_cubes.html
浏览文件 @ bfdb10a8
......@@ -62,7 +62,7 @@
light.position.normalize();
scene.addLight( light );
var geometry = new THREE.Cube( 20, 20, 20 );
var geometry = new THREE.CubeGeometry( 20, 20, 20 );
for ( var i = 0; i < 500; i ++ ) {
......
examples/webgl_interactive_voxelpainter.html
浏览文件 @ bfdb10a8
......@@ -61,7 +61,7 @@
// roll-over helpers
rollOverGeo = new THREE.Cube( 50, 50, 50 );
rollOverGeo = new THREE.CubeGeometry( 50, 50, 50 );
rollOverMaterial = new THREE.MeshBasicMaterial( { color: 0xff0000, opacity: 0.5, transparent: true } );
rollOverMesh = new THREE.Mesh( rollOverGeo, rollOverMaterial );
scene.addObject( rollOverMesh );
......@@ -69,7 +69,7 @@
// cubes
cubeGeo = new THREE.Cube( 50, 50, 50 );
cubeGeo = new THREE.CubeGeometry( 50, 50, 50 );
cubeMaterial = new THREE.MeshLambertMaterial( { color: 0x00ff80, shading: THREE.FlatShading, map: THREE.ImageUtils.loadTexture( "textures/square-outline-textured.png" ) } );
cubeMaterial.color.setHSV( 0.1, 0.7, 1.0 );
// picking
......@@ -78,7 +78,7 @@
// grid
plane = new THREE.Mesh( new THREE.Plane( 1000, 1000, 20, 20 ), new THREE.MeshBasicMaterial( { color: 0x555555, wireframe: true } ) );
plane = new THREE.Mesh( new THREE.PlaneGeometry( 1000, 1000, 20, 20 ), new THREE.MeshBasicMaterial( { color: 0x555555, wireframe: true } ) );
plane.rotation.x = - 90 * Math.PI / 180;
scene.addObject( plane );
......
examples/webgl_lights_pointlights.html
浏览文件 @ bfdb10a8
......@@ -106,7 +106,7 @@
light3 = new THREE.PointLight( 0x80ff80, 2, 50 );
scene.addLight( light3 );
var sphere = new THREE.Sphere( 0.5, 16, 8 );
var sphere = new THREE.SphereGeometry( 0.5, 16, 8 );
var l1 = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: 0xff0040 } ) );
l1.position = light1.position;
......
examples/webgl_lines_colors.html
浏览文件 @ bfdb10a8
......@@ -239,7 +239,7 @@
} );
postprocessing.quad = new THREE.Mesh( new THREE.Plane( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad.position.z = - 500;
postprocessing.scene.addObject( postprocessing.quad );
......
examples/webgl_lines_splines.html
浏览文件 @ bfdb10a8
......@@ -191,7 +191,7 @@
} );
var plane = new THREE.Plane( window.innerWidth, window.innerHeight );
var plane = new THREE.PlaneGeometry( window.innerWidth, window.innerHeight );
quadScreen = new THREE.Mesh( plane, materialConvolution );
quadScreen.position.z = -100;
......
examples/webgl_lod.html
浏览文件 @ bfdb10a8
......@@ -85,10 +85,10 @@
var geometry = [
[ new THREE.Sphere( 100, 64, 32 ), 300 ],
[ new THREE.Sphere( 100, 32, 16 ), 1000 ],
[ new THREE.Sphere( 100, 16, 8 ), 2000 ],
[ new THREE.Sphere( 100, 8, 4 ), 10000 ]
[ new THREE.SphereGeometry( 100, 64, 32 ), 300 ],
[ new THREE.SphereGeometry( 100, 32, 16 ), 1000 ],
[ new THREE.SphereGeometry( 100, 16, 8 ), 2000 ],
[ new THREE.SphereGeometry( 100, 8, 4 ), 10000 ]
];
......
examples/webgl_materials.html
浏览文件 @ bfdb10a8
......@@ -88,9 +88,9 @@
// Spheres geometry
var geometry_smooth = new THREE.Sphere( 70, 32, 16 );
var geometry_flat = new THREE.Sphere( 70, 32, 16 );
var geometry_pieces = new THREE.Sphere( 70, 32, 16 ); // Extra geometry to be broken down for MeshFaceMaterial
var geometry_smooth = new THREE.SphereGeometry( 70, 32, 16 );
var geometry_flat = new THREE.SphereGeometry( 70, 32, 16 );
var geometry_pieces = new THREE.SphereGeometry( 70, 32, 16 ); // Extra geometry to be broken down for MeshFaceMaterial
for ( var i = 0, l = geometry_pieces.faces.length; i < l; i ++ ) {
......@@ -127,7 +127,7 @@
}
particleLight = new THREE.Mesh( new THREE.Sphere( 4, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0xffffff } ) );
particleLight = new THREE.Mesh( new THREE.SphereGeometry( 4, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0xffffff } ) );
scene.addObject( particleLight );
// Lights
......
examples/webgl_materials_cars_camaro.html
浏览文件 @ bfdb10a8
......@@ -92,7 +92,7 @@
scene.addLight( pointLight );
sphere = new THREE.Sphere( 100, 16, 8, 1 );
sphere = new THREE.SphereGeometry( 100, 16, 8, 1 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: 0xffaa00 } ) );
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
lightMesh.position = pointLight.position;
......
examples/webgl_materials_cars_camaro_crosseyed.html
浏览文件 @ bfdb10a8
......@@ -95,7 +95,7 @@
scene.addLight( pointLight );
sphere = new THREE.Sphere( 100, 16, 8, 1 );
sphere = new THREE.SphereGeometry( 100, 16, 8, 1 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: 0xffaa00 } ) );
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
lightMesh.position = pointLight.position;
......
examples/webgl_materials_cubemap.html
浏览文件 @ bfdb10a8
......@@ -90,7 +90,7 @@
scene.addLight( pointLight );
// light representation
sphere = new THREE.Sphere( 100, 16, 8 );
sphere = new THREE.SphereGeometry( 100, 16, 8 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color:0xffaa00 } ) );
lightMesh.position = pointLight.position;
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
......
examples/webgl_materials_cubemap_balls_reflection.html
浏览文件 @ bfdb10a8
......@@ -77,7 +77,7 @@
scene = new THREE.Scene();
sceneCube = new THREE.Scene();
var geometry = new THREE.Sphere( 100, 32, 16 );
var geometry = new THREE.SphereGeometry( 100, 32, 16 );
var path = "textures/cube/pisa/";
var format = '.png';
......
examples/webgl_materials_cubemap_balls_reflection_anaglyph.html
浏览文件 @ bfdb10a8
......@@ -73,7 +73,7 @@
scene = new THREE.Scene();
var geometry = new THREE.Sphere( 100, 32, 16 );
var geometry = new THREE.SphereGeometry( 100, 32, 16 );
var path = "textures/cube/pisa/";
var format = '.png';
......
examples/webgl_materials_cubemap_balls_refraction.html
浏览文件 @ bfdb10a8
......@@ -76,7 +76,7 @@
scene = new THREE.Scene();
sceneCube = new THREE.Scene();
var geometry = new THREE.Sphere( 100, 32, 16 );
var geometry = new THREE.SphereGeometry( 100, 32, 16 );
var path = "textures/cube/skybox/";
var format = '.jpg';
......
examples/webgl_materials_cubemap_balls_refraction_crosseyed.html
浏览文件 @ bfdb10a8
......@@ -75,7 +75,7 @@
scene = new THREE.Scene();
var geometry = new THREE.Sphere( 100, 32, 16 );
var geometry = new THREE.SphereGeometry( 100, 32, 16 );
var path = "textures/cube/skybox/";
var format = '.jpg';
......
examples/webgl_materials_cubemap_escher.html
浏览文件 @ bfdb10a8
......@@ -81,7 +81,7 @@
var textureCube = THREE.ImageUtils.loadTextureCube( urls );
var material = new THREE.MeshBasicMaterial( { color: 0xffffff, envMap: textureCube } )
var geometry = new THREE.Sphere( 100, 96, 64 );
var geometry = new THREE.SphereGeometry( 100, 96, 64 );
var mesh = new THREE.Mesh( geometry, material );
mesh.scale.x = mesh.scale.y = mesh.scale.z = 16;
......
examples/webgl_materials_cubemap_refraction.html
浏览文件 @ bfdb10a8
......@@ -88,7 +88,7 @@
scene.addLight( pointLight );
// light representation
sphere = new THREE.Sphere( 100, 16, 8 );
sphere = new THREE.SphereGeometry( 100, 16, 8 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color:0xffaa00 } ) );
lightMesh.position = pointLight.position;
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
......
examples/webgl_materials_grass.html
浏览文件 @ bfdb10a8
......@@ -40,7 +40,7 @@
scene = new THREE.Scene();
var geometry = new THREE.Plane( 100, 100 );
var geometry = new THREE.PlaneGeometry( 100, 100 );
var bitmap = generateTextureBase();
......
examples/webgl_materials_normalmap.html
浏览文件 @ bfdb10a8
......@@ -116,7 +116,7 @@
// light representation
var sphere = new THREE.Sphere( 100, 16, 8 );
var sphere = new THREE.SphereGeometry( 100, 16, 8 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color:0xffaa00 } ) );
lightMesh.position = pointLight.position;
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
......
examples/webgl_materials_shaders.html
浏览文件 @ bfdb10a8
......@@ -125,7 +125,7 @@
scene.addLight( pointLight );
// light representation
sphere = new THREE.Sphere( 100, 16, 8 );
sphere = new THREE.SphereGeometry( 100, 16, 8 );
lightMesh = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: 0xffaa00 } ) );
lightMesh.scale.x = lightMesh.scale.y = lightMesh.scale.z = 0.05;
lightMesh.position = pointLight.position;
......@@ -134,7 +134,7 @@
scene.addObject( lightMesh );
// material samples
sphere = new THREE.Sphere( 100, 32, 32 );
sphere = new THREE.SphereGeometry( 100, 32, 32 );
var y1 = 0, y2 = - 200;
......
examples/webgl_materials_shaders_fresnel.html
浏览文件 @ bfdb10a8
......@@ -79,7 +79,7 @@
scene = new THREE.Scene();
sceneCube = new THREE.Scene();
var geometry = new THREE.Sphere( 100, 32, 16 );
var geometry = new THREE.SphereGeometry( 100, 32, 16 );
var path = "textures/cube/Park2/";
var format = '.jpg';
......
examples/webgl_materials_texture_filters.html
浏览文件 @ bfdb10a8
......@@ -123,7 +123,7 @@
textureCanvas2.needsUpdate = true;
var i, j, uvs, geometryRepeat = new THREE.Plane( 100, 100, 1, 1 );
var i, j, uvs, geometryRepeat = new THREE.PlaneGeometry( 100, 100, 1, 1 );
for ( i = 0; i < geometryRepeat.faceVertexUvs[ 0 ].length; i ++ ) {
......@@ -160,7 +160,7 @@
scene.addObject( meshCanvas );
scene2.addObject( meshCanvas2 );
var geometry = new THREE.Plane( 100, 100, 1, 1 ),
var geometry = new THREE.PlaneGeometry( 100, 100, 1, 1 ),
mesh = new THREE.Mesh( geometry, materialPainting ),
mesh2 = new THREE.Mesh( geometry, materialPainting2 );
......
examples/webgl_materials_video.html
浏览文件 @ bfdb10a8
......@@ -130,7 +130,7 @@
ox = i;
oy = j;
geometry = new THREE.Cube( xsize, ysize, xsize );
geometry = new THREE.CubeGeometry( xsize, ysize, xsize );
change_uvs( geometry, ux, uy, ox, oy );
materials[ cube_count ] = new THREE.MeshLambertMaterial( parameters );
......@@ -242,7 +242,7 @@
} );
postprocessing.quad = new THREE.Mesh( new THREE.Plane( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad.position.z = -500;
postprocessing.scene.addObject( postprocessing.quad );
......
examples/webgl_morphtargets.html
浏览文件 @ bfdb10a8
......@@ -109,7 +109,7 @@
scene.addLight( light );
var geometry = new THREE.Cube( 100, 100, 100 );
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
var material = new THREE.MeshLambertMaterial( { color: 0xffffff, morphTargets: true } );
// construct 8 blend shapes
......
examples/webgl_multiple_canvases_complex.html
浏览文件 @ bfdb10a8
......@@ -132,7 +132,7 @@
scene.addLight( light );
var shadowMaterial = new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/shadow.png' ) } );
var shadowGeo = new THREE.Plane( 300, 300, 1, 1 );
var shadowGeo = new THREE.PlaneGeometry( 300, 300, 1, 1 );
mesh = new THREE.Mesh( shadowGeo, shadowMaterial );
mesh.position.y = - 250;
......@@ -155,9 +155,9 @@
var color, f, f2, f3, p, n, vertexIndex,
geometry = new THREE.Icosahedron( 1 ),
geometry2 = new THREE.Icosahedron( 1 ),
geometry3 = new THREE.Icosahedron( 1 );
geometry = new THREE.IcosahedronGeometry( 1 ),
geometry2 = new THREE.IcosahedronGeometry( 1 ),
geometry3 = new THREE.IcosahedronGeometry( 1 );
for ( var i = 0; i < geometry.faces.length; i++ ) {
......
examples/webgl_multiple_canvases_grid.html
浏览文件 @ bfdb10a8
......@@ -148,7 +148,7 @@
scene.addLight( light );
var shadowMaterial = new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/shadow.png' ) } );
var shadowGeo = new THREE.Plane( 300, 300, 1, 1 );
var shadowGeo = new THREE.PlaneGeometry( 300, 300, 1, 1 );
mesh = new THREE.Mesh( shadowGeo, shadowMaterial );
mesh.position.y = - 250;
......@@ -171,9 +171,9 @@
var color, f, f2, f3, p, n, vertexIndex,
geometry = new THREE.Icosahedron( 1 ),
geometry2 = new THREE.Icosahedron( 1 ),
geometry3 = new THREE.Icosahedron( 1 );
geometry = new THREE.IcosahedronGeometry( 1 ),
geometry2 = new THREE.IcosahedronGeometry( 1 ),
geometry3 = new THREE.IcosahedronGeometry( 1 );
for ( var i = 0; i < geometry.faces.length; i++ ) {
......
examples/webgl_objconvert_test.html
浏览文件 @ bfdb10a8
......@@ -32,12 +32,6 @@
<p>Models by <a href="http://sketchup.google.com/3dwarehouse/details?mid=2c6fd128fca34052adc5f5b98d513da1">Reallusion</a>
<a href="http://sketchup.google.com/3dwarehouse/details?mid=f526cc4abf7cb68d76cab47c765b7255">iClone</a>.
<p>Using a modified version of <a href="http://github.com/alteredq/three.js">Three.js</a> by mrdoob.
<br/>
<p>Best viewed in Chrome 9 or Firefox 4 using WebGL renderer.
<p>Canvas renderer is very slow on anything other than Chrome.
</div>
<pre id="log"></pre>
......@@ -112,7 +106,7 @@
xm.map.needsUpdate = true;
xm.map.repeat.set( 10, 10 );
geometry = new THREE.Plane( 100, 100, 15, 10 );
geometry = new THREE.PlaneGeometry( 100, 100, 15, 10 );
mesh = new THREE.Mesh( geometry, xm );
mesh.position.x = 0;
......@@ -127,7 +121,7 @@
// SPHERES
var material_spheres = new THREE.MeshLambertMaterial( { color: 0xdddddd } ),
sphere = new THREE.Sphere( 100, 16, 8 );
sphere = new THREE.SphereGeometry( 100, 16, 8 );
for ( var i=0; i<10; i++ ) {
mesh = new THREE.Mesh( sphere, material_spheres );
......@@ -216,7 +210,7 @@
for ( var i = 0; i < materials.length; i ++ ) {
// material
mesh = new THREE.Mesh( new THREE.Plane( size, size ), materials[i] );
mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), materials[i] );
mesh.position.x = i * (size + 5) - ( ( materials.length - 1 )* ( size + 5 )/2);
mesh.position.y = FLOOR + size/2 + bottom;
mesh.position.z = -100;
......@@ -238,7 +232,7 @@
var xm = new THREE.MeshBasicMaterial( { map: new THREE.Texture( x ) } );
xm.map.needsUpdate = true;
mesh = new THREE.Mesh( new THREE.Plane( size, size ), xm );
mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), xm );
mesh.position.x = i * (size + 5) - ( ( materials.length - 1 )* ( size + 5 )/2);
mesh.position.y = FLOOR + size/2 + bottom;
mesh.position.z = -99;
......
examples/webgl_panorama_equirectangular.html
浏览文件 @ bfdb10a8
......@@ -59,7 +59,7 @@
scene = new THREE.Scene();
mesh = new THREE.Mesh( new THREE.Sphere( 500, 60, 40 ), new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/2294472375_24a3b8ef46_o.jpg' ) } ) );
mesh = new THREE.Mesh( new THREE.SphereGeometry( 500, 60, 40 ), new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/2294472375_24a3b8ef46_o.jpg' ) } ) );
mesh.scale.x = -1;
scene.addObject( mesh );
......
examples/webgl_particles_dynamic.html
浏览文件 @ bfdb10a8
......@@ -146,7 +146,7 @@
parent = new THREE.Object3D();
scene.addObject( parent );
var grid = new THREE.ParticleSystem( new THREE.Plane( 15000, 15000, 64, 64 ), new THREE.ParticleBasicMaterial( { color: 0xff0000, size: 10 } ) );
var grid = new THREE.ParticleSystem( new THREE.PlaneGeometry( 15000, 15000, 64, 64 ), new THREE.ParticleBasicMaterial( { color: 0xff0000, size: 10 } ) );
grid.rotation.x = 1.57;
grid.position.y = -400;
parent.addChild( grid );
......@@ -335,7 +335,7 @@
} );
effect.quad = new THREE.Mesh( new THREE.Plane( SCREEN_WIDTH, SCREEN_HEIGHT ), effect.materialHeat );
effect.quad = new THREE.Mesh( new THREE.PlaneGeometry( SCREEN_WIDTH, SCREEN_HEIGHT ), effect.materialHeat );
effect.quad.position.z = -500;
effect.scene.addObject( effect.quad );
......@@ -402,7 +402,7 @@
effect.materialFilm.uniforms.sIntensity.value = 0.5;
effect.materialFilm.uniforms.sCount.value = 1448;
effect.quad = new THREE.Mesh( new THREE.Plane( SCREEN_WIDTH, SCREEN_HEIGHT ), effect.materialConvolution );
effect.quad = new THREE.Mesh( new THREE.PlaneGeometry( SCREEN_WIDTH, SCREEN_HEIGHT ), effect.materialConvolution );
effect.quad.position.z = -500;
effect.scene.addObject( effect.quad );
......
examples/webgl_postprocessing.html
浏览文件 @ bfdb10a8
......@@ -173,7 +173,7 @@
} );
var plane = new THREE.Plane( window.innerWidth, window.innerHeight );
var plane = new THREE.PlaneGeometry( window.innerWidth, window.innerHeight );
quadBG = new THREE.Mesh( plane, materialColor );
quadBG.position.z = -500;
......
examples/webgl_postprocessing_dof.html
浏览文件 @ bfdb10a8
......@@ -102,9 +102,9 @@
if( singleMaterial ) zmaterial = [ cubeMaterial ];
//var geo = new THREE.Cube( 1, 1, 1 );
//var geo = new THREE.Icosahedron( 2 );
var geo = new THREE.Sphere( 1, 20, 10 );
//var geo = new THREE.CubeGeometry( 1, 1, 1 );
//var geo = new THREE.IcosahedronGeometry( 2 );
var geo = new THREE.SphereGeometry( 1, 20, 10 );
var start = new Date().getTime();
......@@ -259,7 +259,7 @@
} );
postprocessing.quad = new THREE.Mesh( new THREE.Plane( window.innerWidth, window.innerHeight ), postprocessing.materialBokeh );
postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), postprocessing.materialBokeh );
postprocessing.quad.position.z = - 500;
postprocessing.scene.addObject( postprocessing.quad );
......
examples/webgl_ribbons.html
浏览文件 @ bfdb10a8
......@@ -270,7 +270,7 @@
} );
postprocessing.quad = new THREE.Mesh( new THREE.Plane( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad.position.z = -500;
postprocessing.scene.addObject( postprocessing.quad );
......
examples/webgl_rtt.html
浏览文件 @ bfdb10a8
......@@ -150,7 +150,7 @@
// var mt = new THREE.MeshBasicMaterial( { color:0xffffff, map: ImageUtils.loadTexture( "textures/land_ocean_ice_cloud_2048.jpg" ) } );
var plane = new THREE.Plane( window.innerWidth, window.innerHeight );
var plane = new THREE.PlaneGeometry( window.innerWidth, window.innerHeight );
quad = new THREE.Mesh( plane, material );
quad.position.z = -100;
......@@ -164,7 +164,7 @@
sceneScreen.addObject( quad );
var n = 5,
geometry = new THREE.Sphere( 10, 64, 32 ),
geometry = new THREE.SphereGeometry( 10, 64, 32 ),
material2 = new THREE.MeshLambertMaterial( { color:0xffffff, map: rtTexture } );
//material2 = new THREE.MeshBasicMaterial( { color:0xffffff, map: rtTexture } );
......
examples/webgl_sandbox.html
浏览文件 @ bfdb10a8
......@@ -102,30 +102,37 @@
<script type="text/javascript" src="../src/renderers/renderables/RenderableObject.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableParticle.js"></script>
<script type="text/javascript" src="../src/renderers/renderables/RenderableLine.js"></script>
<script type="text/javascript" src="../src/extras/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/extras/animation/Animation.js"></script>
<script type="text/javascript" src="../src/extras/ColorUtils.js"></script>
<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
<script type="text/javascript" src="../src/extras/ShaderUtils.js"></script>
<script type="text/javascript" src="../src/extras/animation/AnimationHandler.js"></script>
<script type="text/javascript" src="../src/extras/animation/Animation.js"></script>
<script type="text/javascript" src="../src/extras/cameras/QuakeCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/PathCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/FlyCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Cube.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Cylinder.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Icosahedron.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Lathe.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Plane.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Sphere.js"></script>
<script type="text/javascript" src="../src/extras/geometries/Torus.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnot.js"></script>
<script type="text/javascript" src="../src/extras/cameras/RollCamera.js"></script>
<script type="text/javascript" src="../src/extras/cameras/TrackballCamera.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CubeGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/CylinderGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/IcosahedronGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/LatheGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/PlaneGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/SphereGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TextGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusGeometry.js"></script>
<script type="text/javascript" src="../src/extras/geometries/TorusKnotGeometry.js"></script>
<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
<script type="text/javascript" src="../src/extras/io/JSONLoader.js"></script>
<script type="text/javascript" src="../src/extras/io/BinaryLoader.js"></script>
<script type="text/javascript" src="../src/extras/io/SceneLoader.js"></script>
<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
<script type="text/javascript" src="../src/extras/objects/Trident.js"></script>
<script type="text/javascript" src="../src/extras/physics/Collisions.js"></script>
<script type="text/javascript" src="../src/extras/physics/CollisionUtils.js"></script>
<script type="text/javascript" src="../src/extras/renderers/AnaglyphWebGLRenderer.js"></script>
<script type="text/javascript" src="../src/extras/renderers/CrosseyedWebGLRenderer.js"></script>
<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
......@@ -159,7 +166,7 @@
scene = new THREE.Scene();
scene.fog = new THREE.Fog( 0xffffff, 1, 10000 );
var geometry = new THREE.Sphere( 50, 32, 16 );
var geometry = new THREE.SphereGeometry( 50, 32, 16 );
var uniforms = THREE.ShaderUtils.lib[ 'basic' ].uniforms;
var vertexShader = THREE.ShaderUtils.lib[ 'basic' ].vertexShader;
......
examples/webgl_scene_test.html
浏览文件 @ bfdb10a8
......@@ -359,7 +359,7 @@
var object, geometry, material, light, count = 500, range = 200;
material = new THREE.MeshLambertMaterial( { color:0xffffff } );
geometry = new THREE.Cube( 5, 5, 5 );
geometry = new THREE.CubeGeometry( 5, 5, 5 );
for( var i = 0; i < count; i++ ) {
......
examples/webgl_scene_test_blender.html
浏览文件 @ bfdb10a8
......@@ -324,7 +324,7 @@
var object, geometry, material, light, count = 500, range = 200;
material = new THREE.MeshLambertMaterial( { color:0xffffff } );
geometry = new THREE.Cube( 5, 5, 5 );
geometry = new THREE.CubeGeometry( 5, 5, 5 );
for( var i = 0; i < count; i++ ) {
......
examples/webgl_shader.html
浏览文件 @ bfdb10a8
......@@ -125,7 +125,7 @@
} );
mesh = new THREE.Mesh( new THREE.Plane( 2, 2 ), material );
mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), material );
scene.addObject( mesh );
renderer = new THREE.WebGLRenderer();
......
examples/webgl_shader2.html
浏览文件 @ bfdb10a8
......@@ -228,7 +228,7 @@
mlib[ i ] = material;
mesh = new THREE.Mesh( new THREE.Cube( size, size, size, 1, 1, 1, [ mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ] ], false ), new THREE.MeshFaceMaterial() );
mesh = new THREE.Mesh( new THREE.CubeGeometry( size, size, size, 1, 1, 1, [ mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ], mlib[ i ] ], false ), new THREE.MeshFaceMaterial() );
mesh.position.x = i - ( params.length - 1 ) / 2;
mesh.position.y = i % 2 - 0.5;
scene.addObject( mesh );
......
examples/webgl_shader_lava.html
浏览文件 @ bfdb10a8
......@@ -163,7 +163,7 @@
} );
mesh = new THREE.Mesh( new THREE.Torus( size, 0.3, 30, 30 ), [ material /*, new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, wireframeLinewidth: 2 } ) */ ] );
mesh = new THREE.Mesh( new THREE.TorusGeometry( size, 0.3, 30, 30 ), [ material /*, new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, wireframeLinewidth: 2 } ) */ ] );
mesh.position.x = 0;
mesh.position.y = 0;
mesh.rotation.x = 0.3;
......@@ -257,7 +257,7 @@
postprocessing.materialFilm.uniforms.sIntensity.value = 0.95;
postprocessing.materialFilm.uniforms.sCount.value = 2048;
postprocessing.quad = new THREE.Mesh( new THREE.Plane( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad.position.z = - 500;
postprocessing.scene.addObject( postprocessing.quad );
......
examples/webgl_stencil.html
浏览文件 @ bfdb10a8
......@@ -51,7 +51,7 @@
// world
var cube = new THREE.Cube( 300, 300, 10 );
var cube = new THREE.CubeGeometry( 300, 300, 10 );
var material0 = new THREE.MeshPhongMaterial( { color:0xff00ff } );
var material1 = new THREE.MeshLambertMaterial( { color:0x00ff00 } );
var material2 = new THREE.MeshLambertMaterial( { color:0x0000ff } );
......@@ -77,10 +77,10 @@
// moving objects
var cube = new THREE.Cube( 40, 40, 40 );
var torus = new THREE.Torus( 40, 10 );
var sphere = new THREE.Sphere( 40 );
var cylinder = new THREE.Cylinder( 10, 10, 20, 40, 0, 0 );
var cube = new THREE.CubeGeometry( 40, 40, 40 );
var torus = new THREE.TorusGeometry( 40, 10 );
var sphere = new THREE.SphereGeometry( 40 );
var cylinder = new THREE.CylinderGeometry( 10, 10, 20, 40, 0, 0 );
mesh = new THREE.Mesh( torus, material1 );
scene.addChild( mesh );
......@@ -98,7 +98,7 @@
light.position.set( 0, 1, 0 );
scene.addChild( light );
var cube = new THREE.Sphere( 5 );
var cube = new THREE.SphereGeometry( 5 );
lightCube = new THREE.Mesh( cube, material2 );
scene.addChild( lightCube );
......
examples/webgl_stencilLensFlare.html
浏览文件 @ bfdb10a8
......@@ -50,7 +50,7 @@
// world
var cube = new THREE.Cube( 300, 300, 10 );
var cube = new THREE.CubeGeometry( 300, 300, 10 );
var material0 = new THREE.MeshPhongMaterial( { color:0xff00ff } );
var material1 = new THREE.MeshLambertMaterial( { color:0x00ff00 } );
var material2 = new THREE.MeshLambertMaterial( { color:0x0000ff } );
......@@ -76,10 +76,10 @@
// moving objects
var cube = new THREE.Cube( 40, 40, 40 );
var torus = new THREE.Torus( 40, 10 );
var sphere = new THREE.Sphere( 40 );
var cylinder = new THREE.Cylinder( 10, 10, 20, 40, 0, 0 );
var cube = new THREE.CubeGeometry( 40, 40, 40 );
var torus = new THREE.TorusGeometry( 40, 10 );
var sphere = new THREE.SphereGeometry( 40 );
var cylinder = new THREE.CylinderGeometry( 10, 10, 20, 40, 0, 0 );
mesh = new THREE.Mesh( torus, material1 );
scene.addChild( mesh );
......@@ -102,7 +102,7 @@
scene.addChild( light );
var cube = new THREE.Sphere( 2 );
var cube = new THREE.SphereGeometry( 2 );
lightCube = new THREE.Mesh( cube, material2 );
lightCube.visible = false;
scene.addChild( lightCube );
......
examples/webgl_text.html 已删除 100644 → 0
浏览文件 @ d46a1ee3
<!DOCTYPE HTML>
<html lang="en">
<head>
<title>three.js webgl - geometry - text</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
<style type="text/css">
body {
font-family: Monospace;
background-color: #000;
color: #fff;
margin: 0px;
overflow: hidden;
}
#info {
position: absolute;
top: 10px;
width: 100%;
text-align: center;
z-index: 100;
display:block;
}
#info a, .button { color: #f00; font-weight: bold; text-decoration: underline; cursor: pointer }
</style>
</head>
<body>
<div id="info">
<a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - procedural 3D text by <a href="http://www.lab4games.net/zz85/blog" target="_blank">zz85</a> &amp; alteredq
(fonts from <a href="http://typeface.neocracy.org/">typeface.js</a> and <a href="http://en.wikipedia.org/wiki/Droid_%28font%29">Droid</a>)
<br/>type to enter new text, drag to spin the text
<br/><span class="button" id="color">change color</span>,
<span class="button" id="font">change font</span>,
<span class="button" id="weight">change weight</span>,
<span class="button" id="postprocessing">change postprocessing</span>,
<a id="permalink" href="#">permalink</a>
</div>
<script type="text/javascript" src="../build/Three.js"></script>
<script type="text/javascript" src="js/Detector.js"></script>
<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>
<script type="text/javascript" src="js/Stats.js"></script>
<!-- load the font file from canvas-text -->
<!--
-->
<script type="text/javascript" src="fonts/gentilis_bold.typeface.js"></script>
<script type="text/javascript" src="fonts/gentilis_regular.typeface.js"></script>
<script type="text/javascript" src="fonts/optimer_bold.typeface.js"></script>
<script type="text/javascript" src="fonts/optimer_regular.typeface.js"></script>
<script type="text/javascript" src="fonts/helvetiker_bold.typeface.js"></script>
<script type="text/javascript" src="fonts/helvetiker_regular.typeface.js"></script>
<script type="text/javascript" src="fonts/droid/droid_sans_regular.typeface.js"></script>
<script type="text/javascript" src="fonts/droid/droid_sans_bold.typeface.js"></script>
<script type="text/javascript" src="fonts/droid/droid_serif_regular.typeface.js"></script>
<script type="text/javascript" src="fonts/droid/droid_serif_bold.typeface.js"></script>
<script type="text/javascript">
if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
var container, stats, permalink, hex, color;
var camera, scene, renderer;
var textMesh1, textMesh2, textGeo, textMaterial, parent;
var firstLetter = true;
var text = "three.js",
height = 20,
size = 80,
hover = 30,
curveSegments = 6,
font = "optimer", // helvetiker, optimer, gentilis, droid sans, droid serif
weight = "bold", // normal bold
style = "normal"; // normal italic
var mirror = true;
var fontMap = {
"helvetiker" : 0,
"optimer" : 1,
"gentilis" : 2,
"droid sans" : 3,
"droid serif" : 4
};
var weightMap = {
"normal" : 0,
"bold" : 1
}
var reverseFontMap = {};
var reverseWeightMap = {};
for ( var i in fontMap ) reverseFontMap[ fontMap[i] ] = i;
for ( var i in weightMap ) reverseWeightMap[ weightMap[i] ] = i;
var targetRotation = 0;
var targetRotationOnMouseDown = 0;
var mouseX = 0;
var mouseXOnMouseDown = 0;
var windowHalfX = window.innerWidth / 2;
var windowHalfY = window.innerHeight / 2;
var postprocessing = { enabled : true };
var glow = 0.9;
init();
animate();
function capitalize( txt ) {
return txt.substring( 0, 1 ).toUpperCase() + txt.substring( 1 );
}
function decimalToHex( d ) {
var hex = Number( d ).toString( 16 );
hex = "000000".substr( 0, 6 - hex.length ) + hex;
return hex.toUpperCase();
}
function init() {
container = document.createElement( 'div' );
document.body.appendChild( container );
permalink = document.getElementById( "permalink" );
camera = new THREE.Camera( 30, window.innerWidth / window.innerHeight, 1, 1500 );
camera.position.y = 400;
camera.position.z = 700;
camera.target.position.y = 100;
scene = new THREE.Scene();
scene.fog = new THREE.Fog( 0x000000, 250, 1400 );
var dirLight = new THREE.DirectionalLight( 0xffffff, 0.125 );
dirLight.position.set( 0, 0, 1 );
dirLight.position.normalize();
scene.addLight( dirLight );
var pointLight = new THREE.PointLight( 0xffffff, 1.5 );
pointLight.position.set( 0, 100, 50 );
scene.addLight( pointLight );
//text = capitalize( font ) + " " + capitalize( weight );
//text = "abcdefghijklmnopqrstuvwxyz0123456789";
//text = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
// Get text from hash
var hash = document.location.hash.substr( 1 );
if ( hash.length !== 0 ) {
var colorhash = hash.substring( 0, 6 );
var fonthash = hash.substring( 6, 7 );
var weighthash = hash.substring( 7, 8 );
var pphash = hash.substring( 8, 9 );
var texthash = hash.substring( 10 );
hex = colorhash;
pointLight.color.setHex( parseInt( colorhash, 16 ) );
font = reverseFontMap[ parseInt( fonthash ) ];
weight = reverseWeightMap[ parseInt( weighthash ) ];
postprocessing.enabled = parseInt( pphash );
text = decodeURI( texthash );
updatePermalink();
} else {
pointLight.color.setHSV( Math.random(), 0.95, 0.85 );
pointLight.color.updateHex();
hex = decimalToHex( pointLight.color.hex );
}
textGeo = new THREE.Text( text, {
size: size,
height: height,
curveSegments: curveSegments,
font: font,
weight: weight,
style: style
});
textMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, wireframe: false } );
parent = new THREE.Object3D();
textMesh1 = new THREE.Mesh( textGeo, textMaterial );
textMesh1.position.x = 0;
textMesh1.position.y = hover;
textMesh1.position.z = 0;
textMesh1.rotation.x = 0;
textMesh1.rotation.y = Math.PI * 2;
parent.addChild( textMesh1 );
if ( mirror ) {
textMesh2 = new THREE.Mesh( textGeo, textMaterial );
textMesh2.position.x = 0;
textMesh2.position.y = -hover;
textMesh2.position.z = height;
textMesh2.rotation.x = Math.PI;
textMesh2.rotation.y = Math.PI * 2;
parent.addChild( textMesh2 );
}
parent.position.y = 100;
scene.addChild( parent );
var plane = new THREE.Mesh( new THREE.Plane( 10000, 10000 ), new THREE.MeshBasicMaterial( { color: 0xffffff, opacity: 0.5, transparent: true } ) );
plane.rotation.x = -1.57;
plane.position.y = 100;
scene.addChild( plane );
renderer = new THREE.WebGLRenderer( { antialias: false } );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.setClearColor( scene.fog.color, 1 );
container.appendChild( renderer.domElement );
stats = new Stats();
stats.domElement.style.position = 'absolute';
stats.domElement.style.top = '0px';
//container.appendChild( stats.domElement );
document.addEventListener( 'mousedown', onDocumentMouseDown, false );
document.addEventListener( 'touchstart', onDocumentTouchStart, false );
document.addEventListener( 'touchmove', onDocumentTouchMove, false );
document.addEventListener( 'keypress', onDocumentKeyPress, false );
document.addEventListener( 'keydown', onDocumentKeyDown, false );
document.getElementById( "color" ).addEventListener( 'click', function() {
pointLight.color.setHSV( Math.random(), 0.95, 0.85 );
pointLight.color.updateHex();
hex = decimalToHex( pointLight.color.hex );
updatePermalink();
}, false );
document.getElementById( "font" ).addEventListener( 'click', function() {
if ( font == "helvetiker" ) {
font = "optimer";
} else if ( font == "optimer" ) {
font = "gentilis";
} else if ( font == "gentilis" ) {
font = "droid sans";
} else if ( font == "droid sans" ) {
font = "droid serif";
} else {
font = "helvetiker";
}
refreshText();
}, false );
document.getElementById( "weight" ).addEventListener( 'click', function() {
if ( weight == "bold" ) {
weight = "normal";
} else {
weight = "bold";
}
refreshText();
}, false );
document.getElementById( "postprocessing" ).addEventListener( 'click', function() {
postprocessing.enabled = !postprocessing.enabled;
updatePermalink();
}, false );
initPostprocessing();
renderer.autoClear = false;
}
//
function boolToNum( b ) {
return b ? 1 : 0;
}
function updatePermalink() {
var link = hex + fontMap[ font ] + weightMap[ weight ] + boolToNum( postprocessing.enabled ) + "#" + encodeURI( text );
permalink.href = "#" + link;
window.location.hash = link;
}
function onDocumentKeyDown( event ) {
if ( firstLetter ) {
firstLetter = false;
text = "";
}
var keyCode = event.keyCode;
// backspace
if ( keyCode == 8 ) {
event.preventDefault();
text = text.substring( 0, text.length - 1 );
refreshText();
return false;
}
}
function onDocumentKeyPress( event ) {
var keyCode = event.which;
// backspace
if ( keyCode == 8 ) {
event.preventDefault();
} else {
var ch = String.fromCharCode( keyCode );
text += ch;
refreshText();
}
}
function refreshText() {
updatePermalink();
scene.removeChild( textMesh1 );
textGeo = new THREE.Text( text, {
size: size,
height: height,
curveSegments: curveSegments,
font: font,
weight: weight,
style: style
});
textMesh1 = new THREE.Mesh( textGeo, textMaterial );
textMesh1.position.x = 0;
textMesh1.position.y = hover;
textMesh1.position.z = 0;
textMesh1.rotation.x = 0;
textMesh1.rotation.y = Math.PI * 2;
parent.addChild( textMesh1 );
if ( mirror ) {
scene.removeChild( textMesh2 );
textMesh2 = new THREE.Mesh( textGeo, textMaterial );
textMesh2.position.x = 0;
textMesh2.position.y = -hover;
textMesh2.position.z = height;
textMesh2.rotation.x = Math.PI;
textMesh2.rotation.y = Math.PI * 2;
parent.addChild( textMesh2 );
}
}
function onDocumentMouseDown( event ) {
event.preventDefault();
document.addEventListener( 'mousemove', onDocumentMouseMove, false );
document.addEventListener( 'mouseup', onDocumentMouseUp, false );
document.addEventListener( 'mouseout', onDocumentMouseOut, false );
mouseXOnMouseDown = event.clientX - windowHalfX;
targetRotationOnMouseDown = targetRotation;
}
function onDocumentMouseMove( event ) {
mouseX = event.clientX - windowHalfX;
targetRotation = targetRotationOnMouseDown + ( mouseX - mouseXOnMouseDown ) * 0.02;
}
function onDocumentMouseUp( event ) {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
}
function onDocumentMouseOut( event ) {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
}
function onDocumentTouchStart( event ) {
if ( event.touches.length == 1 ) {
event.preventDefault();
mouseXOnMouseDown = event.touches[ 0 ].pageX - windowHalfX;
targetRotationOnMouseDown = targetRotation;
}
}
function onDocumentTouchMove( event ) {
if ( event.touches.length == 1 ) {
event.preventDefault();
mouseX = event.touches[ 0 ].pageX - windowHalfX;
targetRotation = targetRotationOnMouseDown + ( mouseX - mouseXOnMouseDown ) * 0.05;
}
}
//
function initPostprocessing() {
postprocessing.scene = new THREE.Scene();
postprocessing.camera = new THREE.Camera();
postprocessing.camera.projectionMatrix = THREE.Matrix4.makeOrtho( window.innerWidth / - 2, window.innerWidth / 2, window.innerHeight / 2, window.innerHeight / - 2, -10000, 10000 );
postprocessing.camera.position.z = 100;
var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat };
postprocessing.rtTexture1 = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
postprocessing.rtTexture2 = new THREE.WebGLRenderTarget( 512, 512, pars );
postprocessing.rtTexture3 = new THREE.WebGLRenderTarget( 512, 512, pars );
var screen_shader = THREE.ShaderUtils.lib["screen"];
var screen_uniforms = THREE.UniformsUtils.clone( screen_shader.uniforms );
screen_uniforms["tDiffuse"].texture = postprocessing.rtTexture1;
screen_uniforms["opacity"].value = 1.0;
postprocessing.materialScreen = new THREE.MeshShaderMaterial( {
uniforms: screen_uniforms,
vertexShader: screen_shader.vertexShader,
fragmentShader: screen_shader.fragmentShader,
blending: THREE.AdditiveBlending,
transparent: true
} );
var convolution_shader = THREE.ShaderUtils.lib["convolution"];
var convolution_uniforms = THREE.UniformsUtils.clone( convolution_shader.uniforms );
postprocessing.blurx = new THREE.Vector2( 0.001953125, 0.0 ),
postprocessing.blury = new THREE.Vector2( 0.0, 0.001953125 );
convolution_uniforms["tDiffuse"].texture = postprocessing.rtTexture1;
convolution_uniforms["uImageIncrement"].value = postprocessing.blurx;
convolution_uniforms["cKernel"].value = THREE.ShaderUtils.buildKernel( 4.0 );
postprocessing.materialConvolution = new THREE.MeshShaderMaterial( {
uniforms: convolution_uniforms,
vertexShader: "#define KERNEL_SIZE 25.0\n" + convolution_shader.vertexShader,
fragmentShader: "#define KERNEL_SIZE 25\n" + convolution_shader.fragmentShader
} );
var film_shader = THREE.ShaderUtils.lib["film"];
var film_uniforms = THREE.UniformsUtils.clone( film_shader.uniforms );
film_uniforms["tDiffuse"].texture = postprocessing.rtTexture1;
postprocessing.materialFilm = new THREE.MeshShaderMaterial( { uniforms: film_uniforms, vertexShader: film_shader.vertexShader, fragmentShader: film_shader.fragmentShader } );
postprocessing.materialFilm.uniforms.grayscale.value = 0;
postprocessing.materialFilm.uniforms.nIntensity.value = 0.15;
postprocessing.materialFilm.uniforms.sIntensity.value = 0.25;
postprocessing.materialFilm.uniforms.sCount.value = 2048;
//postprocessing.materialFilm.uniforms.nIntensity.value = 0;
//postprocessing.materialFilm.uniforms.sIntensity.value = 0;
postprocessing.materialScreen.uniforms.opacity.value = glow;
postprocessing.quad = new THREE.Mesh( new THREE.Plane( window.innerWidth, window.innerHeight ), postprocessing.materialConvolution );
postprocessing.quad.position.z = - 500;
postprocessing.scene.addObject( postprocessing.quad );
}
//
function animate() {
requestAnimationFrame( animate );
render();
stats.update();
}
var delta, time, oldTime;
function render() {
if ( ! oldTime ) oldTime = new Date().getTime();
time = new Date().getTime();
delta = 0.1 * ( time - oldTime );
oldTime = time;
parent.rotation.y += ( targetRotation - parent.rotation.y ) * 0.05;
if ( postprocessing.enabled ) {
renderer.clear();
// Render scene into texture
renderer.render( scene, camera, postprocessing.rtTexture1, true );
// Render quad with blured scene into texture (convolution pass 1)
postprocessing.quad.materials[ 0 ] = postprocessing.materialConvolution;
postprocessing.materialConvolution.uniforms.tDiffuse.texture = postprocessing.rtTexture1;
postprocessing.materialConvolution.uniforms.uImageIncrement.value = postprocessing.blurx;
renderer.render( postprocessing.scene, postprocessing.camera, postprocessing.rtTexture2, true );
// Render quad with blured scene into texture (convolution pass 2)
postprocessing.materialConvolution.uniforms.tDiffuse.texture = postprocessing.rtTexture2;
postprocessing.materialConvolution.uniforms.uImageIncrement.value = postprocessing.blury;
renderer.render( postprocessing.scene, postprocessing.camera, postprocessing.rtTexture3, true );
// Render original scene with superimposed blur to texture
postprocessing.quad.materials[ 0 ] = postprocessing.materialScreen;
postprocessing.materialScreen.uniforms.tDiffuse.texture = postprocessing.rtTexture3;
renderer.render( postprocessing.scene, postprocessing.camera, postprocessing.rtTexture1, false );
// Render to screen
postprocessing.materialFilm.uniforms.time.value += 0.01;
postprocessing.quad.materials[ 0 ] = postprocessing.materialFilm;
postprocessing.materialScreen.uniforms.tDiffuse.texture = postprocessing.rtTexture1;
renderer.render( postprocessing.scene, postprocessing.camera );
} else {
renderer.clear();
renderer.render( scene, camera );
}
}
</script>
</body>
</html>
examples/webgl_trackballcamera_earth.html
浏览文件 @ bfdb10a8
......@@ -170,7 +170,7 @@
// planet
geometry = new THREE.Sphere( radius, 100, 50 );
geometry = new THREE.SphereGeometry( radius, 100, 50 );
geometry.computeTangents();
meshPlanet = new THREE.Mesh( geometry, materialNormalMap );
......
src/extras/SceneUtils.js
浏览文件 @ bfdb10a8
......@@ -33,7 +33,7 @@ THREE.SceneUtils = {
} ),
mesh = new THREE.Mesh( new THREE.Cube( size, size, size, 1, 1, 1, null, true ), material );
mesh = new THREE.Mesh( new THREE.CubeGeometry( size, size, size, 1, 1, 1, null, true ), material );
scene.addObject( mesh );
return mesh;
......
src/extras/cameras/PathCamera.js
浏览文件 @ bfdb10a8
......@@ -281,7 +281,7 @@ THREE.PathCamera = function ( parameters ) {
parent.addChild( particleObj );
var waypoint,
geo = new THREE.Sphere( 1, 16, 8 ),
geo = new THREE.SphereGeometry( 1, 16, 8 ),
mat = new THREE.MeshBasicMaterial( { color: 0x00ff00 } );
for ( i = 0; i < spline.points.length; i++ ) {
......@@ -310,8 +310,8 @@ THREE.PathCamera = function ( parameters ) {
var dummyParentMaterial = new THREE.MeshLambertMaterial( { color: 0x0077ff } ),
dummyChildMaterial = new THREE.MeshLambertMaterial( { color: 0x00ff00 } ),
dummyParentGeo = new THREE.Cube( 10, 10, 20 ),
dummyChildGeo = new THREE.Cube( 2, 2, 10 );
dummyParentGeo = new THREE.CubeGeometry( 10, 10, 20 ),
dummyChildGeo = new THREE.CubeGeometry( 2, 2, 10 );
this.animationParent = new THREE.Mesh( dummyParentGeo, dummyParentMaterial );
......
src/extras/io/SceneLoader.js
浏览文件 @ bfdb10a8
......@@ -473,32 +473,32 @@ THREE.SceneLoader.prototype = {
if ( g.type == "cube" ) {
geometry = new THREE.Cube( g.width, g.height, g.depth, g.segmentsWidth, g.segmentsHeight, g.segmentsDepth, null, g.flipped, g.sides );
geometry = new THREE.CubeGeometry( g.width, g.height, g.depth, g.segmentsWidth, g.segmentsHeight, g.segmentsDepth, null, g.flipped, g.sides );
result.geometries[ dg ] = geometry;
} else if ( g.type == "plane" ) {
geometry = new THREE.Plane( g.width, g.height, g.segmentsWidth, g.segmentsHeight );
geometry = new THREE.PlaneGeometry( g.width, g.height, g.segmentsWidth, g.segmentsHeight );
result.geometries[ dg ] = geometry;
} else if ( g.type == "sphere" ) {
geometry = new THREE.Sphere( g.radius, g.segmentsWidth, g.segmentsHeight );
geometry = new THREE.SphereGeometry( g.radius, g.segmentsWidth, g.segmentsHeight );
result.geometries[ dg ] = geometry;
} else if ( g.type == "cylinder" ) {
geometry = new THREE.Cylinder( g.numSegs, g.topRad, g.botRad, g.height, g.topOffset, g.botOffset );
geometry = new THREE.CylinderGeometry( g.numSegs, g.topRad, g.botRad, g.height, g.topOffset, g.botOffset );
result.geometries[ dg ] = geometry;
} else if ( g.type == "torus" ) {
geometry = new THREE.Torus( g.radius, g.tube, g.segmentsR, g.segmentsT );
geometry = new THREE.TorusGeometry( g.radius, g.tube, g.segmentsR, g.segmentsT );
result.geometries[ dg ] = geometry;
} else if ( g.type == "icosahedron" ) {
geometry = new THREE.Icosahedron( g.subdivisions );
geometry = new THREE.IcosahedronGeometry( g.subdivisions );
result.geometries[ dg ] = geometry;
} else if ( g.type == "bin_mesh" ) {
......
src/extras/objects/Trident.js
浏览文件 @ bfdb10a8
......@@ -54,7 +54,7 @@ THREE.Trident = function ( params /** Object */) {
function getCone ( color ) {
//0.1 required to get a cone with a mapped bottom face
return new THREE.Mesh( new THREE.Cylinder( 30, 0.1, params.length / 20, params.length / 5 ), new THREE.MeshBasicMaterial( { color : color } ) );
return new THREE.Mesh( new THREE.CylinderGeometry( 30, 0.1, params.length / 20, params.length / 5 ), new THREE.MeshBasicMaterial( { color : color } ) );
}
function getSegment ( point, color ){
......
src/extras/renderers/AnaglyphWebGLRenderer.js
浏览文件 @ bfdb10a8
......@@ -62,7 +62,7 @@ if ( THREE.WebGLRenderer ) {
} );
var _scene = new THREE.Scene();
_scene.addObject( new THREE.Mesh( new THREE.Plane( 2, 2 ), _material ) );
_scene.addObject( new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), _material ) );
this.setSize = function ( width, height ) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或