Parcourir la source

changed localToGlobal/globalToLocal to use h3d.col.Point instead of h3d.Vector

Nicolas Cannasse il y a 4 ans
Parent
commit
94ef7e41f0
2 fichiers modifiés avec 9 ajouts et 9 suppressions
  1. 4 4
      h3d/Camera.hx
  2. 5 5
      h3d/scene/Object.hx

+ 4 - 4
h3d/Camera.hx

@@ -170,10 +170,10 @@ class Camera {
 
 	public function update() {
 		if( follow != null ) {
-			pos.set(0, 0, 0);
-			target.set(0, 0, 0);
-			follow.pos.localToGlobal(pos);
-			follow.target.localToGlobal(target);
+			var fpos = follow.pos.localToGlobal();
+			var ftarget = follow.target.localToGlobal();
+			pos.set(fpos.x, fpos.y, fpos.z);
+			target.set(ftarget.x, ftarget.y, ftarget.z);
 			// Animate FOV
 			if( follow.pos.name != null ) {
 				var p = follow.pos;

+ 5 - 5
h3d/scene/Object.hx

@@ -323,18 +323,18 @@ class Object implements hxd.impl.Serializable {
 	/**
 		Convert a local position (or [0,0] if pt is null) relative to the object origin into an absolute global position, applying all the inherited transforms.
 	**/
-	public function localToGlobal( ?pt : h3d.Vector ) {
+	public function localToGlobal( ?pt : h3d.col.Point ) {
 		syncPos();
-		if( pt == null ) pt = new h3d.Vector();
-		pt.transform3x4(absPos);
+		if( pt == null ) pt = new h3d.col.Point();
+		pt.transform(absPos);
 		return pt;
 	}
 
 	/**
 		Convert an absolute global position into a local position relative to the object origin, applying all the inherited transforms.
 	**/
-	public function globalToLocal( pt : h3d.Vector ) {
-		pt.transform3x4(getInvPos());
+	public function globalToLocal( pt : h3d.col.Point ) {
+		pt.transform(getInvPos());
 		return pt;
 	}