From 4b18cf51517f7af204bc4cb9d8a4e28d69f084ef Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Sun, 21 Jun 2015 00:57:24 +0100 Subject: [PATCH] Simplified animation skinning blending example. --- examples/js/BlendCharacterGui.js | 15 +-------------- examples/webgl_animation_skinning_blending.html | 9 --------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/examples/js/BlendCharacterGui.js b/examples/js/BlendCharacterGui.js index e50f11d457..136a7c0747 100644 --- a/examples/js/BlendCharacterGui.js +++ b/examples/js/BlendCharacterGui.js @@ -7,7 +7,6 @@ function BlendCharacterGui(animations) { var controls = { gui: null, - "Lock Camera": false, "Show Model": true, "Show Skeleton": false, "Time Scale": 1.0, @@ -55,7 +54,6 @@ function BlendCharacterGui(animations) { var playback = controls.gui.addFolder( 'Playback' ); var blending = controls.gui.addFolder( 'Blend Tuning' ); - settings.add( controls, "Lock Camera" ).onChange( controls.lockCameraChanged ); settings.add( controls, "Show Model" ).onChange( controls.showModelChanged ); settings.add( controls, "Show Skeleton" ).onChange( controls.showSkeletonChanged ); settings.add( controls, "Time Scale", 0, 1, 0.01 ); @@ -174,17 +172,6 @@ function BlendCharacterGui(animations) { }; - controls.lockCameraChanged = function() { - - var data = { - detail: { - shouldLock: controls['Lock Camera'] - } - }; - - window.dispatchEvent( new CustomEvent( 'toggle-lock-camera', data ) ); - }; - controls.showSkeletonChanged = function() { var data = { @@ -211,4 +198,4 @@ function BlendCharacterGui(animations) { init.call(this); -} \ No newline at end of file +} diff --git a/examples/webgl_animation_skinning_blending.html b/examples/webgl_animation_skinning_blending.html index 8b7cc2dc1f..b18461ea2c 100644 --- a/examples/webgl_animation_skinning_blending.html +++ b/examples/webgl_animation_skinning_blending.html @@ -94,7 +94,6 @@ window.addEventListener( 'weight-animation', onWeightAnimation ); window.addEventListener( 'crossfade', onCrossfade ); window.addEventListener( 'warp', onWarp ); - window.addEventListener( 'toggle-lock-camera', onLockCameraToggle ); window.addEventListener( 'toggle-show-skeleton', onShowSkeleton ); window.addEventListener( 'toggle-show-model', onShowModel ); @@ -184,14 +183,6 @@ } - - function onLockCameraToggle( event ) { - - var shouldLock = event.detail.shouldLock; - controls.enabled = !shouldLock; - - } - function onShowSkeleton( event ) { var shouldShow = event.detail.shouldShow; -- GitLab