Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #14107 from WestLangley/dev-morph_points

PointsMaterial: add morph target support
Mr.doob 7 years ago
parent
be79232197 610865831f
commit
6fd78839c2
4 changed files with 38 additions and 6 deletions
Unified View Show Diff Stats
  1. 3 0
      docs/api/materials/PointsMaterial.html
  2. 27 6
      examples/webgl_morphtargets_sphere.html
  3. 6 0
      src/materials/PointsMaterial.js
  4. 2 0
      src/renderers/shaders/ShaderLib/points_vert.glsl

+ 3 - 0
docs/api/materials/PointsMaterial.html
View File 

@@ -84,6 +84,9 @@ scene.add( starField );
 
 
 
 		<p>Sets the color of the points using data from a [page:Texture].</p>
 
 		<p>Sets the color of the points using data from a [page:Texture].</p>
 
 
 
+		<h3>[property:Boolean morphTargets]</h3>
 
+		<p>Define whether the material uses morphTargets. Default is false.</p>
 
+
 
 		<h3>[property:Number size]</h3>
 
 		<h3>[property:Number size]</h3>
 
 		<p>Sets the size of the points. Default is 1.0.</p>
 
 		<p>Sets the size of the points. Default is 1.0.</p>

+ 27 - 6
examples/webgl_morphtargets_sphere.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <html lang="en">
 
 	<head>
 
 	<head>
 
-		<title>three.js webgl - morph targets - horse</title>
 
+		<title>three.js webgl - morph targets - sphere</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<style>
 
 		<style>
 
@@ -63,15 +63,13 @@
 
 				camera.position.set( 0, 5, 5 );
 
 				camera.position.set( 0, 5, 5 );
 
 
 
 				scene = new THREE.Scene();
 
 				scene = new THREE.Scene();
 
-				scene.background = new THREE.Color( 0x222222 );
 
-				scene.fog = new THREE.Fog( 0x000000, 1, 15000 );
 
 
 
 				var light = new THREE.PointLight( 0xff2200, 0.7 );
 
 				var light = new THREE.PointLight( 0xff2200, 0.7 );
 
 				light.position.set( 100, 100, 100 );
 
 				light.position.set( 100, 100, 100 );
 
 				scene.add( light );
 
 				scene.add( light );
 
 
 
 				light = new THREE.PointLight( 0x22ff00, 0.7 );
 
 				light = new THREE.PointLight( 0x22ff00, 0.7 );
 
-				light.position.set( -100, -100, -100 );
 
+				light.position.set( - 100, - 100, - 100 );
 
 				scene.add( light );
 
 				scene.add( light );
 
 
 
 				light = new THREE.AmbientLight( 0x111111 );
 
 				light = new THREE.AmbientLight( 0x111111 );
 
@@ -90,9 +88,30 @@
 
 
 
 					mesh.rotation.z = Math.PI / 2;
 
 					mesh.rotation.z = Math.PI / 2;
 
 
 
+					//mesh.material.visible = false;
 
+
 
 					scene.add( mesh );
 
 					scene.add( mesh );
 
 
 
-				});
 
+					//
 
+
 
+					var pointsMaterial = new THREE.PointsMaterial( {
 
+
 
+						size: 10,
 
+						sizeAttenuation: false,
 
+						map: new THREE.TextureLoader().load( 'textures/sprites/disc.png' ),
 
+						alphaTest: 0.5,
 
+						morphTargets: true
 
+
 
+					} );
 
+
 
+					points = new THREE.Points( mesh.geometry, pointsMaterial );
 
+
 
+					points.morphTargetInfluences = mesh.morphTargetInfluences;
 
+					points.morphTargetDictionary = mesh.morphTargetDictionary;
 
+
 
+					mesh.add( points );
 
+
 
+				} );
 
 
 
 				//
 
 				//
 
 
 
@@ -104,6 +123,8 @@
 
 				//
 
 				//
 
 
 
 				controls = new THREE.OrbitControls( camera, renderer.domElement );
 
 				controls = new THREE.OrbitControls( camera, renderer.domElement );
 
+				controls.minDistance = 1;
 
+				controls.maxDistance = 20;
 
 
 
 				//
 
 				//
 
 
 
@@ -137,7 +158,7 @@
 
 
 
 					if ( mesh.morphTargetInfluences[ 1 ] <= 0 || mesh.morphTargetInfluences[ 1 ] >= 1 ) {
 
 					if ( mesh.morphTargetInfluences[ 1 ] <= 0 || mesh.morphTargetInfluences[ 1 ] >= 1 ) {
 
 
 
-						sign *= -1;
 
+						sign *= - 1;
 
 
 
 					}
 
 					}

+ 6 - 0
src/materials/PointsMaterial.js
View File 

@@ -12,6 +12,8 @@ import { Color } from '../math/Color.js';
 
  *
 
  *
 
  *  size: <float>,
 
  *  size: <float>,
 
  *  sizeAttenuation: <bool>
 
  *  sizeAttenuation: <bool>
 
+ *
 
+ *  morphTargets: <bool>
 
  * }
 
  * }
 
  */
 
  */
 
 
 
@@ -28,6 +30,8 @@ function PointsMaterial( parameters ) {
 
 	this.size = 1;
 
 	this.size = 1;
 
 	this.sizeAttenuation = true;
 
 	this.sizeAttenuation = true;
 
 
 
+	this.morphTargets = false;
 
+
 
 	this.lights = false;
 
 	this.lights = false;
 
 
 
 	this.setValues( parameters );
 
 	this.setValues( parameters );
 
@@ -50,6 +54,8 @@ PointsMaterial.prototype.copy = function ( source ) {
 
 	this.size = source.size;
 
 	this.size = source.size;
 
 	this.sizeAttenuation = source.sizeAttenuation;
 
 	this.sizeAttenuation = source.sizeAttenuation;
 
 
 
+	this.morphTargets = source.morphTargets;
 
+
 
 	return this;
 
 	return this;
 
 
 
 };
 
 };

+ 2 - 0
src/renderers/shaders/ShaderLib/points_vert.glsl
View File 

@@ -4,6 +4,7 @@ uniform float scale;
 
 #include <common>
 
 #include <common>
 
 #include <color_pars_vertex>
 
 #include <color_pars_vertex>
 
 #include <fog_pars_vertex>
 
 #include <fog_pars_vertex>
 
+#include <morphtarget_pars_vertex>
 
 #include <logdepthbuf_pars_vertex>
 
 #include <logdepthbuf_pars_vertex>
 
 #include <clipping_planes_pars_vertex>
 
 #include <clipping_planes_pars_vertex>
 
 
 
@@ -11,6 +12,7 @@ void main() {
 
 
 
 	#include <color_vertex>
 
 	#include <color_vertex>
 
 	#include <begin_vertex>
 
 	#include <begin_vertex>
 
+	#include <morphtarget_vertex>
 
 	#include <project_vertex>
 
 	#include <project_vertex>
 
 
 
 	#ifdef USE_SIZEATTENUATION
 
 	#ifdef USE_SIZEATTENUATION