Skip to content

Examples: Clean up #15458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 22, 2018
Merged

Examples: Clean up #15458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6375ee
Exampels: Clean up
Mugen87 Dec 20, 2018
57f4b5c
Examples: More clean up
Mugen87 Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions examples/misc_exporter_gltf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
map: mapGrid
} );

object = new THREE.Mesh( new THREE.IcosahedronGeometry( 75, 0 ), material );
object = new THREE.Mesh( new THREE.IcosahedronBufferGeometry( 75, 0 ), material );
object.position.set( - 200, 0, 200 );
object.name = 'Icosahedron';
scene1.add( object );
Expand All @@ -222,7 +222,7 @@
color: 0x0000ff,
wireframe: true
} );
object = new THREE.Mesh( new THREE.OctahedronGeometry( 75, 1 ), material );
object = new THREE.Mesh( new THREE.OctahedronBufferGeometry( 75, 1 ), material );
object.position.set( 0, 0, 200 );
object.name = 'Octahedron';
scene1.add( object );
Expand All @@ -234,7 +234,7 @@
opacity: 0.5
} );

object = new THREE.Mesh( new THREE.TetrahedronGeometry( 75, 0 ), material );
object = new THREE.Mesh( new THREE.TetrahedronBufferGeometry( 75, 0 ), material );
object.position.set( 200, 0, 200 );
object.name = 'Tetrahedron';
scene1.add( object );
Expand Down Expand Up @@ -269,7 +269,7 @@
color: 0xff0000,
roughness: 1
} );
object = new THREE.Mesh( new THREE.TorusKnotGeometry( 50, 15, 40, 10 ), material );
object = new THREE.Mesh( new THREE.TorusKnotBufferGeometry( 50, 15, 40, 10 ), material );
object.position.set( - 200, 0, 0 );
object.name = "Cylinder";
scene1.add( object );
Expand Down Expand Up @@ -459,15 +459,15 @@
side: THREE.DoubleSide
} );

object = new THREE.Mesh( new THREE.CircleGeometry( 50, 20, 0, Math.PI * 2 ), material );
object = new THREE.Mesh( new THREE.CircleBufferGeometry( 50, 20, 0, Math.PI * 2 ), material );
object.position.set( 200, 0, - 400 );
scene1.add( object );

object = new THREE.Mesh( new THREE.RingGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material );
object = new THREE.Mesh( new THREE.RingBufferGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material );
object.position.set( 0, 0, - 400 );
scene1.add( object );

object = new THREE.Mesh( new THREE.CylinderGeometry( 25, 75, 100, 40, 5 ), material );
object = new THREE.Mesh( new THREE.CylinderBufferGeometry( 25, 75, 100, 40, 5 ), material );
object.position.set( - 200, 0, - 400 );
scene1.add( object );

Expand All @@ -480,7 +480,7 @@

}

object = new THREE.Mesh( new THREE.LatheGeometry( points, 20 ), material );
object = new THREE.Mesh( new THREE.LatheBufferGeometry( points, 20 ), material );
object.position.set( 200, 0, 400 );
scene1.add( object );

Expand Down
54 changes: 5 additions & 49 deletions examples/webgl_interactive_raycasting_points.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,45 +173,6 @@

}

function generateRegularPointcloud( color, width, length ) {

var geometry = new THREE.Geometry();

var colors = [];

var k = 0;

for ( var i = 0; i < width; i ++ ) {

for ( var j = 0; j < length; j ++ ) {

var u = i / width;
var v = j / length;
var x = u - 0.5;
var y = ( Math.cos( u * Math.PI * 8 ) + Math.sin( v * Math.PI * 8 ) ) / 20;
var z = v - 0.5;
var v = new THREE.Vector3( x, y, z );
geometry.vertices.push( v );

var intensity = ( y + 0.1 ) * 7;
colors[ k ] = ( color.clone().multiplyScalar( intensity ) );

k ++;

}

}

geometry.colors = colors;
geometry.computeBoundingBox();

var material = new THREE.PointsMaterial( { size: pointSize, vertexColors: THREE.VertexColors } );
var pointcloud = new THREE.Points( geometry, material );

return pointcloud;

}

function init() {

var container = document.getElementById( 'container' );
Expand All @@ -221,33 +182,28 @@
clock = new THREE.Clock();

camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 );
camera.position.set( 10, 10, 10 );
camera.position.set( 15, 15, 15 );
camera.lookAt( scene.position );
camera.updateMatrix();

//

var pcBuffer = generatePointcloud( new THREE.Color( 1, 0, 0 ), width, length );
pcBuffer.scale.set( 10, 10, 10 );
pcBuffer.position.set( - 5, 0, 5 );
pcBuffer.position.set( - 10, 0, 0 );
scene.add( pcBuffer );

var pcIndexed = generateIndexedPointcloud( new THREE.Color( 0, 1, 0 ), width, length );
pcIndexed.scale.set( 10, 10, 10 );
pcIndexed.position.set( 5, 0, 5 );
pcIndexed.position.set( 0, 0, 0 );
scene.add( pcIndexed );

var pcIndexedOffset = generateIndexedWithOffsetPointcloud( new THREE.Color( 0, 1, 1 ), width, length );
pcIndexedOffset.scale.set( 10, 10, 10 );
pcIndexedOffset.position.set( 5, 0, - 5 );
pcIndexedOffset.position.set( 10, 0, 0 );
scene.add( pcIndexedOffset );

var pcRegular = generateRegularPointcloud( new THREE.Color( 1, 0, 1 ), width, length );
pcRegular.scale.set( 10, 10, 10 );
pcRegular.position.set( - 5, 0, - 5 );
scene.add( pcRegular );

pointclouds = [ pcBuffer, pcIndexed, pcIndexedOffset, pcRegular ];
pointclouds = [ pcBuffer, pcIndexed, pcIndexedOffset ];

//

Expand Down