Merge pull request mrdoob#16947 from Mugen87/dev36

JSM: Added ES6 version of tween.js.
yeticgi · Jun 30, 2019 · 2ac4def · 2ac4def
2 parents 0265b07 + fab87ac
commit 2ac4def
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/examples/css3d_periodictable.html b/examples/css3d_periodictable.html
@@ -81,7 +81,6 @@
 		</style>
 	</head>
 	<body>
-		<script src="js/libs/tween.min.js"></script>
 
 		<div id="info"><a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> css3d - periodic table. <a href="https://plus.google.com/113862800338869870683/posts/QcFk5HrWran" target="_blank" rel="noopener">info</a>.</div>
 		<div id="container"></div>
@@ -96,6 +95,7 @@
 
 			import * as THREE from '../build/three.module.js';
 
+			import { TWEEN } from './jsm/libs/tween.module.min.js';
 			import { TrackballControls } from './jsm/controls/TrackballControls.js';
 			import { CSS3DRenderer, CSS3DObject } from './jsm/renderers/CSS3DRenderer.js';
 

diff --git a/examples/css3d_sprites.html b/examples/css3d_sprites.html
@@ -16,7 +16,6 @@
 		</style>
 	</head>
 	<body>
-		<script src="js/libs/tween.min.js"></script>
 
 		<div id="info"><a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> css3d - sprites</div>
 		<div id="container"></div>
@@ -25,6 +24,7 @@
 
 			import * as THREE from '../build/three.module.js';
 
+			import { TWEEN } from './jsm/libs/tween.module.min.js';
 			import { TrackballControls } from './jsm/controls/TrackballControls.js';
 			import { CSS3DRenderer, CSS3DSprite } from './jsm/renderers/CSS3DRenderer.js';
 

diff --git a/examples/js/libs/tween.min.js b/examples/js/libs/tween.min.js
diff --git a/examples/jsm/libs/tween.module.min.js b/examples/jsm/libs/tween.module.min.js
diff --git a/examples/webgl_lights_spotlights.html b/examples/webgl_lights_spotlights.html
@@ -13,12 +13,11 @@
 			by <a href="http://master-domain.com" target="_blank" rel="noopener">Master James</a>
 		</div>
 
-		<script src="js/libs/tween.min.js"></script>
-
 		<script type="module">
 
 			import * as THREE from '../build/three.module.js';
 
+			import { TWEEN } from './jsm/libs/tween.module.min.js';
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 
 

diff --git a/examples/webgl_loader_collada_kinematics.html b/examples/webgl_loader_collada_kinematics.html
@@ -12,14 +12,13 @@
 			robot from <a href="https://github.com/rdiankov/collada_robots" target="_blank" rel="noopener">collada robots</a>
 		</div>
 
-		<script src="js/libs/tween.min.js"></script>
-
 		<script type="module">
 
 			import * as THREE from '../build/three.module.js';
 
 			import Stats from './jsm/libs/stats.module.js';
 
+			import { TWEEN } from './jsm/libs/tween.module.min.js';
 			import { ColladaLoader } from './jsm/loaders/ColladaLoader.js';
 
 			var container, stats;
@@ -135,15 +134,15 @@
 
 				kinematicsTween = new TWEEN.Tween( tweenParameters ).to( target, duration ).easing( TWEEN.Easing.Quadratic.Out );
 
-				kinematicsTween.onUpdate( function () {
+				kinematicsTween.onUpdate( function ( object ) {
 
 					for ( var prop in kinematics.joints ) {
 
 						if ( kinematics.joints.hasOwnProperty( prop ) ) {
 
 							if ( ! kinematics.joints[ prop ].static ) {
 
-								kinematics.setJointValue( prop, this[ prop ] );
+								kinematics.setJointValue( prop, object[ prop ] );
 
 							}