提交 42479eaf 编写于 作者: A alteredq

Editor: merged with @mrdoob's changes.

......@@ -59,10 +59,15 @@
var signals = {
// actions
removeSelectedObject: new SIGNALS.Signal(),
// notifications
sceneCreated: new SIGNALS.Signal(),
sceneChanged: new SIGNALS.Signal(),
objectAdded: new SIGNALS.Signal(),
objectRemoved: new SIGNALS.Signal(),
objectSelected: new SIGNALS.Signal(),
objectChanged: new SIGNALS.Signal(),
materialChanged: new SIGNALS.Signal(),
......
......@@ -182,16 +182,6 @@ var Viewport = function ( signals ) {
};
var onMouseMove = function ( event ) {
if ( controls.enabled ) {
signals.cameraChanged.dispatch( camera );
}
};
var onMouseUp = function ( event ) {
// clear selection when clicking in empty space
......@@ -235,13 +225,11 @@ var Viewport = function ( signals ) {
var onKeyDown = function ( event ) {
console.log( event );
switch ( event.keyCode ) {
case 46: // delete
signals.objectRemoved.dispatch();
signals.removeSelectedObject.dispatch();
break;
......@@ -249,7 +237,6 @@ var Viewport = function ( signals ) {
};
container.dom.addEventListener( 'mousemove', onMouseMove, false );
container.dom.addEventListener( 'mousedown', onMouseDown, false );
container.dom.addEventListener( 'mouseup', onMouseUp, false );
container.dom.addEventListener( 'click', onClick, false );
......@@ -265,7 +252,12 @@ var Viewport = function ( signals ) {
controls.noPan = false;
controls.staticMoving = true;
controls.dynamicDampingFactor = 0.3;
controls.addEventListener( 'change', render );
controls.addEventListener( 'change', function () {
signals.cameraChanged.dispatch( camera );
render();
} );
// signals
......@@ -296,9 +288,9 @@ var Viewport = function ( signals ) {
} );
signals.objectRemoved.add( function ( ) {
signals.removeSelectedObject.add( function () {
if ( !selected ) {
if ( selected === null ) {
console.warn( "No object selected for delete" );
return;
......@@ -515,8 +507,6 @@ var Viewport = function ( signals ) {
renderer.autoUpdateScene = false;
container.dom.appendChild( renderer.domElement );
signals.cameraChanged.dispatch( camera );
animate();
// set up for hotkeys
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册