Merge pull request #2716 from gyohk/master

Rearranged the order of the methods and properties in this definition, t...
This commit is contained in:
Masahiro Wakame
2014-08-29 11:21:55 +09:00
4 changed files with 1050 additions and 911 deletions

View File

@@ -55,12 +55,12 @@
// Cubes
var geometry = new THREE.BoxGeometry(50, 50, 50);
var geometry2 = new THREE.BoxGeometry(50, 50, 50);
var material2 = new THREE.MeshLambertMaterial({ color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 });
for (var i = 0; i < 100; i++) {
var cube = new THREE.Mesh(geometry, material2);
var cube = new THREE.Mesh(geometry2, material2);
cube.scale.y = Math.floor(Math.random() * 2 + 1);

View File

@@ -61,12 +61,12 @@
// Plane
var geometry = new THREE.PlaneGeometry(200, 200);
geometry.applyMatrix(new THREE.Matrix4().makeRotationX(- Math.PI / 2));
var geometry2 = new THREE.PlaneGeometry(200, 200);
geometry2.applyMatrix(new THREE.Matrix4().makeRotationX(- Math.PI / 2));
var material = new THREE.MeshBasicMaterial({ color: 0xe0e0e0, overdraw: 0.5 });
plane = new THREE.Mesh(geometry, material);
plane = new THREE.Mesh(geometry2, material);
scene.add(plane);
renderer = new THREE.CanvasRenderer();

View File

@@ -50,7 +50,7 @@
// Spheres
var geometry = new THREE.SphereGeometry(100, 14, 7);
var geometry2 = new THREE.SphereGeometry(100, 14, 7);
materials = [
@@ -66,9 +66,9 @@
];
for (var i = 0, l = geometry.faces.length; i < l; i++) {
for (var i = 0, l = geometry2.faces.length; i < l; i++) {
var face = geometry.faces[i];
var face = geometry2.faces[i];
if (Math.random() > 0.5) face.materialIndex = Math.floor(Math.random() * materials.length);
}
@@ -79,7 +79,7 @@
for (var i = 0, l = materials.length; i < l; i++) {
var sphere = new THREE.Mesh(geometry, materials[i]);
var sphere = new THREE.Mesh(geometry2, materials[i]);
sphere.position.x = (i % 5) * 200 - 400;
sphere.position.z = Math.floor(i / 5) * 200 - 200;

1943
threejs/three.d.ts vendored

File diff suppressed because it is too large Load Diff