Skip to content

Commit 3135bb4

Browse files
committed
Fixed posture editor
1 parent 67ba948 commit 3135bb4

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

src/editor/posture-editor.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import "mannequin";
2-
import { camera, controls, drawFrame, renderer } from "mannequin/scene.js";
1+
import * as THREE from "three";
2+
import { createStage, Male, Mannequin } from "mannequin";
3+
import { camera, controls, renderer, scene, systemAnimate } from "mannequin/scene.js";
34
import { Torso } from "../organs/Torso.js";
45
import { Head } from "../organs/Head.js";
56
import { Pelvis } from "../organs/Pelvis.js";
@@ -17,7 +18,7 @@ const EPS = 0.00001;
1718

1819

1920
// create a scene with a better shadow
20-
createScene( animate );
21+
createStage( animate );
2122

2223

2324

@@ -246,7 +247,7 @@ btnRemoveModel.addEventListener( 'click', removeModel );
246247

247248
controls.addEventListener( 'start', function () {
248249

249-
renderer.setAnimationLoop( drawFrame );
250+
renderer.setAnimationLoop( systemAnimate );
250251

251252
} );
252253

@@ -373,7 +374,7 @@ function onPointerDown( event ) {
373374

374375
}
375376

376-
renderer.setAnimationLoop( drawFrame );
377+
renderer.setAnimationLoop( systemAnimate );
377378

378379
}
379380

src/scene.js

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,21 @@ document.head.appendChild( meta );
2525

2626

2727

28+
var clock = new THREE.Clock();
29+
30+
31+
32+
function systemAnimate() {
33+
34+
if ( controls ) controls.update();
35+
36+
if ( stage.animationLoop ) stage.animationLoop( clock.getElapsedTime() );
37+
38+
renderer.render( scene, camera );
39+
40+
}
41+
42+
2843

2944
// initialize Three.js elements that are created by default
3045
function initStage( ) {
@@ -61,19 +76,6 @@ function initStage( ) {
6176
window.addEventListener( 'resize', onWindowResize, false );
6277
onWindowResize();
6378

64-
var clock = new THREE.Clock();
65-
66-
67-
function systemAnimate() {
68-
69-
if ( controls ) controls.update();
70-
71-
if ( stage.animationLoop ) stage.animationLoop( clock.getElapsedTime() );
72-
73-
renderer.render( scene, camera );
74-
75-
}
76-
7779
return {
7880
renderer: renderer,
7981
scene: scene,
@@ -174,4 +176,4 @@ function getStage( ) {
174176

175177

176178

177-
export { renderer, scene, camera, light, controls, createStage, getStage };
179+
export { renderer, scene, camera, light, controls, createStage, getStage, systemAnimate, clock };

0 commit comments

Comments
 (0)