Skip to content

JSM: Added ES6 version of tween.js. #16947

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 1 commit into from
Jun 30, 2019
Merged

JSM: Added ES6 version of tween.js. #16947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/css3d_periodictable.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion examples/css3d_sprites.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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';

Expand Down
13 changes: 0 additions & 13 deletions examples/js/libs/tween.min.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions examples/jsm/libs/tween.module.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions examples/webgl_lights_spotlights.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';


Expand Down
7 changes: 3 additions & 4 deletions examples/webgl_loader_collada_kinematics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
robot from <a href="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/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;
Expand Down Expand Up @@ -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 ] );

}

Expand Down