Pārlūkot izejas kodu

use shared.root2d instead local2d for scene resolution

Nicolas Cannasse 3 gadi atpakaļ
vecāks
revīzija
eae8d4dd00

+ 3 - 3
hide/prefab/PolygonEditor.hx

@@ -66,7 +66,7 @@ class MovablePoint {
 	}
 
 	function createText(ctx : Context){
-		var o = new h2d.ObjectFollower(mesh,  @:privateAccess ctx.local2d.getScene());
+		var o = new h2d.ObjectFollower(mesh, ctx.shared.root2d.getScene());
 		var t = new h2d.Text(hxd.res.DefaultFont.get(), o);
 		t.textColor = 0xFFFFFF;
 		t.textAlign = Center;
@@ -81,7 +81,7 @@ class MovablePoint {
 	}
 
 	function worldToScreen(wx: Float, wy: Float, wz: Float, ctx : Context) {
-		var s2d = @:privateAccess ctx.local2d.getScene();
+		var s2d = ctx.shared.root2d.getScene();
 		var camera = @:privateAccess ctx.local3d.getScene().camera;
 		camera.update();
 		var pt = camera.project(wx, wy, wz, s2d.width, s2d.height);
@@ -350,7 +350,7 @@ class PolygonEditor {
 		reset();
 		if(!editMode) return;
 		if(b){
-			var s2d = @:privateAccess ctx.local2d.getScene();
+			var s2d = ctx.shared.root2d.getScene();
 			interactive = new h2d.Interactive(10000, 10000, s2d);
 			interactive.propagateEvents = true;
 			interactive.cancelEvents = false;

+ 1 - 1
hide/prefab/SplineEditor.hx

@@ -415,7 +415,7 @@ class SplineEditor {
 
 		if( editMode ) {
 			createGizmos(ctx);
-			var s2d = @:privateAccess ctx.local2d.getScene();
+			var s2d = ctx.shared.root2d.getScene();
 			interactive = new h2d.Interactive(10000, 10000, s2d);
 			interactive.propagateEvents = true;
 			interactive.onPush =

+ 1 - 1
hide/prefab/terrain/TerrainEditor.hx

@@ -780,7 +780,7 @@ class TerrainEditor {
 
 	public function setSelected( ctx : Context, b : Bool ) {
 		if( b ) {
-			var s2d = @:privateAccess ctx.local2d.getScene();
+			var s2d = ctx.shared.root2d.getScene();
 			if( interactive == null )
 				interactive.remove();
 			interactive = new h2d.Interactive(10000, 10000, s2d);

+ 1 - 1
hrt/prefab/l3d/Layers2D.hx

@@ -347,7 +347,7 @@ class Layers2D extends hrt.prefab.Object3D {
 	function createInteractiveBrush(ectx : hide.prefab.EditContext) {
 		editorCtx = ectx;
 		var ctx = ectx.getContext(this);
-		var s2d = @:privateAccess ctx.local2d.getScene();
+		var s2d = ctx.shared.root2d.getScene();
 		interactive = new h2d.Interactive(10000, 10000, s2d);
 		interactive.propagateEvents = true;
 		interactive.cancelEvents = false;

+ 3 - 3
hrt/prefab/l3d/MeshSpray.hx

@@ -488,7 +488,7 @@ class MeshSpray extends Object3D {
 		if ( obj != null ) {
 			obj.rotationX = rotX;
 			obj.rotationY = rotY;
-			obj.rotationZ = rotZ;	
+			obj.rotationZ = rotZ;
 		}
 		return { mz : mz, rotX : rotX, rotY : rotY, rotZ : rotZ };
 	}
@@ -750,7 +750,7 @@ class MeshSpray extends Object3D {
 					bm.rotZ = ground.rotZ;
 				}
 			}
-			
+
 			mso.redraw();
 		});
 
@@ -816,7 +816,7 @@ class MeshSpray extends Object3D {
 
 	function createInteractiveBrush(ectx : EditContext) {
 		var ctx = ectx.getContext(this);
-		var s2d = @:privateAccess ctx.local2d.getScene();
+		var s2d = ctx.shared.root2d.getScene();
 		interactive = new h2d.Interactive(10000, 10000, s2d);
 		interactive.propagateEvents = true;
 		interactive.cancelEvents = false;

+ 1 - 1
hrt/prefab/l3d/Spline.hx

@@ -78,7 +78,7 @@ class SplinePoint extends Object3D {
 		controlPointsViewer.moveTo(1, 0, 0);
 		controlPointsViewer.lineTo(-1, 0, 0);
 
-		indexText = new h2d.ObjectFollower(pointViewer,  @:privateAccess ctx.local2d.getScene());
+		indexText = new h2d.ObjectFollower(pointViewer, ctx.shared.root2d.getScene());
 		var t = new h2d.Text(hxd.res.DefaultFont.get(), indexText);
 		t.textColor = 0xff00ff;
 		t.textAlign = Center;