Browse Source

Update deprecated function calls (#159)

Leonardo Jeanteur 4 years ago
parent
commit
d7b472ab12
4 changed files with 11 additions and 11 deletions
  1. 3 3
      hide/comp/SceneEditor.hx
  2. 4 4
      hide/view/Model.hx
  3. 2 2
      hide/view/l3d/CameraController2D.hx
  4. 2 2
      hide/view/l3d/Gizmo2D.hx

+ 3 - 3
hide/comp/SceneEditor.hx

@@ -808,7 +808,7 @@ class SceneEditor {
 			}
 			// ensure we get onMove even if outside our interactive, allow fast click'n'drag
 			if( e.button == K.MOUSE_LEFT ) {
-				scene.sevents.startDrag(int.handleEvent);
+				scene.sevents.startCapture(int.handleEvent);
 				e.propagate = false;
 			}
 		};
@@ -818,7 +818,7 @@ class SceneEditor {
 			curDrag = null;
 			dragBtn = -1;
 			if( e.button == K.MOUSE_LEFT ) {
-				scene.sevents.stopDrag();
+				scene.sevents.stopCapture();
 				e.propagate = false;
 
 				var curTime = haxe.Timer.stamp();
@@ -1494,7 +1494,7 @@ class SceneEditor {
 			editor.fileView = view;
 			editor.onChange = function(pname) {
 				edit.onChange(e, 'props.$pname');
-				var e = Std.instance(e, Object3D);
+				var e = Std.downcast(e, Object3D);
 				if( e != null ) {
 					for( ctx in context.shared.getContexts(e) )
 						e.addEditorUI(ctx);

+ 4 - 4
hide/view/Model.hx

@@ -575,11 +575,11 @@ class Model extends FileView {
 				var prevPause = obj.currentAnimation.pause;
 				obj.currentAnimation.pause = true;
 				obj.currentAnimation.setFrame( (e.relX / W) * obj.currentAnimation.frameCount );
-				int.startDrag(function(e) {
+				int.startCapture(function(e) {
 					switch(e.kind ) {
 					case ERelease:
 						obj.currentAnimation.pause = prevPause;
-						int.stopDrag();
+						int.stopCapture();
 					case EMove:
 						obj.currentAnimation.setFrame( (e.relX / W) * obj.currentAnimation.frameCount );
 					default:
@@ -658,10 +658,10 @@ class Model extends FileView {
 					dragInter.onPush = function(e) {
 						if( hxd.Key.isDown( hxd.Key.MOUSE_LEFT) ){
 							var startFrame = curFrame;
-							dragInter.startDrag(function(e) {
+							dragInter.startCapture(function(e) {
 								switch( e.kind ) {
 								case ERelease:
-									dragInter.stopDrag();
+									dragInter.stopCapture();
 									buildTimeline();
 									buildEventPanel();
 									if( curFrame != startFrame )

+ 2 - 2
hide/view/l3d/CameraController2D.hx

@@ -106,7 +106,7 @@ class CameraController2D extends h2d.Object {
 		case EWheel:
 			zoom(e.wheelDelta);
 		case EPush:
-			@:privateAccess scene.events.startDrag(onEvent, function() pushing = -1, e);
+			@:privateAccess scene.events.startCapture(onEvent, function() pushing = -1, e.touchId);
 			pushing = e.button;
 			pushTime = haxe.Timer.stamp();
 			pushStartX = pushX = e.relX;
@@ -114,7 +114,7 @@ class CameraController2D extends h2d.Object {
 		case ERelease, EReleaseOutside:
 			if( pushing == e.button ) {
 				pushing = -1;
-				@:privateAccess scene.events.stopDrag();
+				@:privateAccess scene.events.stopCapture();
 				if( e.kind == ERelease && haxe.Timer.stamp() - pushTime < 0.2 && hxd.Math.distance(e.relX - pushStartX,e.relY - pushStartY) < 5 )
 					onClick(e);
 			}

+ 2 - 2
hide/view/l3d/Gizmo2D.hx

@@ -68,11 +68,11 @@ class Gizmo2D extends h2d.Object {
 		var center = localToGlobal();
 		moving = true;
 		onStartMove(t);
-		int.startDrag(function(e:hxd.Event) {
+		int.startCapture(function(e:hxd.Event) {
 			switch( e.kind ) {
 			case ERelease, EReleaseOutside:
 				moving = false;
-				int.stopDrag();
+				int.stopCapture();
 				onFinishMove();
 			case EMove:
 				var dx = scene.mouseX - dragStartX;