浏览代码

Make every SceneEditor use the advanced CamController

Leonardo Jeanteur 4 年之前
父节点
当前提交
a5150e55c9
共有 3 个文件被更改,包括 2 次插入31 次删除
  1. 2 11
      hide/comp/SceneEditor.hx
  2. 0 10
      hide/view/FXEditor.hx
  3. 0 10
      hide/view/Prefab.hx

+ 2 - 11
hide/comp/SceneEditor.hx

@@ -1,7 +1,6 @@
 package hide.comp;
 
 import hrt.prefab.Reference;
-import h3d.col.Sphere;
 import h3d.scene.Mesh;
 import h3d.col.FPoint;
 import h3d.col.Ray;
@@ -18,6 +17,7 @@ import hrt.prefab.Object3D;
 import h3d.scene.Object;
 
 import hide.comp.cdb.DataFiles;
+import hide.view.CameraController.CamController as CameraController;
 
 enum SelectMode {
 	/**
@@ -38,15 +38,6 @@ enum SelectMode {
 	Nothing;
 }
 
-class CameraController extends h3d.scene.CameraController {
-	override function sync(ctx:h3d.scene.RenderContext) {
-		var old = ctx.elapsedTime;
-		ctx.elapsedTime = hxd.Timer.dt;
-		super.sync(ctx);
-		ctx.elapsedTime = old;
-	}
-}
-
 @:access(hide.comp.SceneEditor)
 class SceneEditorContext extends hide.prefab.EditContext {
 
@@ -296,7 +287,7 @@ class SceneEditor {
 	}
 
 	function makeCamController() : h3d.scene.CameraController {
-		var c = new CameraController(scene.s3d);
+		var c = new CameraController(scene.s3d, this);
 		c.friction = 0.9;
 		c.panSpeed = 0.6;
 		c.zoomAmount = 1.05;

+ 0 - 10
hide/view/FXEditor.hx

@@ -34,16 +34,6 @@ private class FXSceneEditor extends hide.comp.SceneEditor {
 		parent = cast view;
 	}
 
-	override function makeCamController() {
-		var c = new CamController(scene.s3d, this);
-		c.friction = 0.9;
-		c.panSpeed = 0.6;
-		c.zoomAmount = 1.05;
-		c.smooth = 0.7;
-		c.minDistance = 1;
-		return c;
-	}
-
 	override function onSceneReady() {
 		super.onSceneReady();
 		parent.onSceneReady();

+ 0 - 10
hide/view/Prefab.hx

@@ -22,16 +22,6 @@ private class PrefabSceneEditor extends hide.comp.SceneEditor {
 		this.localTransform = false; // TODO: Expose option
 	}
 
-	override function makeCamController() {
-		var c = new CamController(scene.s3d, this);
-		c.friction = 0.9;
-		c.panSpeed = 0.6;
-		c.zoomAmount = 1.05;
-		c.smooth = 0.7;
-		c.minDistance = 1;
-		return c;
-	}
-
 	override function refresh(?mode, ?callback) {
 		parent.onRefresh();
 		super.refresh(mode, callback);