changes in heaps Vector/Point api etc.

hide/comp/SceneEditor.hx

@@ -727,7 +727,7 @@ class SceneEditor {
 				cameraController.set(r, null, null, s.getCenter());
 			}
 			else {
-				centroid.scale3(1.0 / objs.length);
+				centroid.scale(1.0 / objs.length);
 				cameraController.set(centroid.toPoint());
 			}
 		}
@@ -2674,7 +2674,7 @@ class SceneEditor {
 					++count;
 				}
 			}
-			pivot.scale3(1.0 / count);
+			pivot.scale(1.0 / count);
 		}
 		var local = new h3d.Matrix();
 		local.initTranslation(pivot.x, pivot.y, pivot.z);

hide/prefab/PolygonEditor.hx

@@ -313,7 +313,7 @@ class PolygonEditor {
 			l = l * l;
 			if(l == 0) return p.distance(s1);
 			var t = hxd.Math.max(0, hxd.Math.min(1, p.sub(s1).dot(s2.sub(s1)) / l));
-			var proj = s1.add((s2.sub(s1).multiply(t)));
+			var proj = s1.add((s2.sub(s1).scaled(t)));
 			return p.distance(proj);
 		}
 		if(polygonPrefab.points.length < 2) return null;

hide/prefab/SplineEditor.hx

@@ -125,7 +125,7 @@ class SplineEditor {
 			var screenPos = sp.getPoint().toVector();
 			screenPos.project(ctx.local3d.getScene().camera.m);
 			screenPos.z = 0;
-			screenPos.scale3(0.5);
+			screenPos.scale(0.5);
 			screenPos = screenPos.add(new h3d.Vector(0.5,0.5));
 			var dist = screenPos.distance(mousePos);
 			if( dist < minDist || minDist == -1 ) {
@@ -169,7 +169,7 @@ class SplineEditor {
 			var screenPos = s.pos.toVector();
 			screenPos.project(ctx.local3d.getScene().camera.m);
 			screenPos.z = 0;
-			screenPos.scale3(0.5);
+			screenPos.scale(0.5);
 			screenPos = screenPos.add(new h3d.Vector(0.5,0.5));
 			var dist = screenPos.distance(mousePos);
 			if( (dist < minDist || minDist == -1) && dist < 0.1 ) {
@@ -186,7 +186,7 @@ class SplineEditor {
 			var firstPtScreenPos = firstPt.toVector();
 			firstPtScreenPos.project(ctx.local3d.getScene().camera.m);
 			firstPtScreenPos.z = 0;
-			firstPtScreenPos.scale3(0.5);
+			firstPtScreenPos.scale(0.5);
 			firstPtScreenPos = firstPtScreenPos.add(new h3d.Vector(0.5,0.5));
 			var distToFirstPoint = firstPtScreenPos.distance(mousePos);
 
@@ -195,7 +195,7 @@ class SplineEditor {
 			var lastPtSreenPos = lastPt.toVector();
 			lastPtSreenPos.project(ctx.local3d.getScene().camera.m);
 			lastPtSreenPos.z = 0;
-			lastPtSreenPos.scale3(0.5);
+			lastPtSreenPos.scale(0.5);
 			lastPtSreenPos = lastPtSreenPos.add(new h3d.Vector(0.5,0.5));
 			var distTolastPoint = lastPtSreenPos.distance(mousePos);
 
@@ -251,7 +251,7 @@ class SplineEditor {
 		if( spd.tangent != null ) {
 			var dir = spd.tangent.toVector();
 			dir.transform3x3(invMatrix); // Don't take the translation
-			dir.scale3(-1);
+			dir.scale(-1);
 			sp.rotationX = h3d.Matrix.lookAtX(dir).getFloats()[0];
 			sp.rotationY = h3d.Matrix.lookAtX(dir).getFloats()[1];
 			sp.rotationZ = h3d.Matrix.lookAtX(dir).getFloats()[2];

hide/prefab/terrain/TerrainEditor.hx

@@ -307,20 +307,20 @@ class TerrainEditor {
 				var v3 = new h3d.Vector(0, -1, h3 - h);
 				var v4 = new h3d.Vector(-1, 0, h4 - h);
 				var n = v1.cross(v2).add(v2.cross(v3).add(v3.cross(v4).add(v4.cross(v1))));
-				n.scale3(-1.0);
+				n.scale(-1.0);
 				n.normalize();
 				return n;
 			}
 
 			inline function packNormal( n : h3d.Vector ) {
-				n.scale3(0.5);
+				n.scale(0.5);
 				return n.add(new h3d.Vector(0.5, 0.5, 0.5)).toColor();
 			}
 
 			inline function unpackNormal( n : Int ) {
 				var n = h3d.Vector.fromColor(n);
 				n = n.add(new h3d.Vector(-0.5, -0.5, -0.5));
-				n.scale3(2.0);
+				n.scale(2.0);
 				return n;
 			}
 

hide/view/CameraController.hx

@@ -174,7 +174,7 @@ class OrthoController extends CameraControllerBase {
 		);
 		var moveSpeed = Ide.inst.currentConfig.get("sceneeditor.camera.moveSpeed", 1.5);
 
-		var delta = dir.multiply(0.01 * moveSpeed * (distance + scene.camera.zNear));
+		var delta = dir.scaled(0.01 * moveSpeed * (distance + scene.camera.zNear));
 		delta.w = 0;
 		targetOffset = targetOffset.sub(delta);
 	}
@@ -316,7 +316,7 @@ class FPSController extends CameraControllerBase {
 		mov.transform3x3(getScene().camera.getInverseView());
 		var moveSpeed = Ide.inst.currentConfig.get("sceneeditor.camera.moveSpeed", 1.5) * camSpeed;
 
-		var delta = mov.multiply(moveSpeed);
+		var delta = mov.scaled(moveSpeed);
 		delta.w = 0;
 		targetOffset = targetOffset.sub(delta);
 	}
@@ -456,7 +456,7 @@ class CamController extends CameraControllerBase {
 		);
 		var moveSpeed = Ide.inst.currentConfig.get("sceneeditor.camera.moveSpeed", 1.5);
 
-		var delta = dir.multiply(0.01 * moveSpeed * (distance + scene.camera.zNear));
+		var delta = dir.scaled(0.01 * moveSpeed * (distance + scene.camera.zNear));
 		delta.w = 0;
 		targetOffset = targetOffset.sub(delta);
 	}

hide/view/l3d/LightProbeBaker.hx

@@ -393,7 +393,7 @@ class LightProbeBaker {
 			case 5: dir.x = -1.0 + u; dir.y = -1.0 + v;  dir.z = -1.0;
 			default:
 		}
-		dir.normalizeFast();
+		dir.normalize();
 		return dir;
 	}
 

hrt/prefab/fx/Emitter.hx

@@ -250,13 +250,13 @@ private class ParticleInstance {
 		//SCALE
 		var def = emitter.instDef;
 		var scaleVec = evaluator.getVector(idx, def.stretch, t, tmpScale);
-		scaleVec.scale3(evaluator.getFloat(idx, def.scale, t));
+		scaleVec.scale(evaluator.getFloat(idx, def.scale, t));
 		localMat.initScale(scaleVec.x, scaleVec.y, scaleVec.z);
 
 		// ROTATION
 		if(def.rotation != VZero) {
 			var rot = evaluator.getVector(idx, def.rotation, t, tmpRot);
-			rot.scale3(Math.PI / 180.0);
+			rot.scale(Math.PI / 180.0);
 			localMat.rotate(rot.x, rot.y, rot.z);
 		}
 
@@ -298,7 +298,7 @@ private class ParticleInstance {
 		// ACCELERATION
 		if(def.acceleration != VZero) {
 			evaluator.getVector(idx, def.acceleration, t, tmpSpeedAccumulation);
-			tmpSpeedAccumulation.scale3(dt);
+			tmpSpeedAccumulation.scale(dt);
 			tmpSpeedAccumulation.transform3x3(emitOrientation);
 			add(speedAccumulation, tmpSpeedAccumulation);
 		}
@@ -306,7 +306,7 @@ private class ParticleInstance {
 		// WORLD ACCELERATION
 		if(def.worldAcceleration != VZero) {
 			evaluator.getVector(idx, def.worldAcceleration, t, tmpSpeedAccumulation);
-			tmpSpeedAccumulation.scale3(dt);
+			tmpSpeedAccumulation.scale(dt);
 			if(emitter.simulationSpace == Local)
 				tmpSpeedAccumulation.transform3x3(emitter.invTransform);
 			add(speedAccumulation, tmpSpeedAccumulation);
@@ -325,7 +325,7 @@ private class ParticleInstance {
 		if (def.dampen != VZero) {
 			var dampen = evaluator.getFloat(idx, def.dampen, t);
 			var scale = Math.exp(dampen* -dt);
-			speedAccumulation.scale3(scale);
+			speedAccumulation.scale(scale);
 		}
 
 
@@ -870,7 +870,7 @@ class EmitterObject extends h3d.scene.Object {
 						while( tmpOffset.lengthSq() > 1.0 );
 						if( emitSurface )
 							tmpOffset.normalize();
-						tmpOffset.scale3(0.5);
+						tmpOffset.scale(0.5);
 						if( emitOrientation == Normal )
 							tmpQuat.initDirection(tmpOffset);
 					case Cone:
@@ -881,7 +881,7 @@ class EmitterObject extends h3d.scene.Object {
 						tmpDir.x = Math.cos(phi) * scaleX;
 						tmpDir.y = Math.sin(phi) * Math.sin(theta) * scaleY;
 						tmpDir.z = Math.sin(phi) * Math.cos(theta) * scaleZ;
-						tmpDir.normalizeFast();
+						tmpDir.normalize();
 						tmpQuat.initDirection(tmpDir);
 				}
 

hrt/prefab/fx/FX.hx

@@ -175,7 +175,7 @@ class FXAnimation extends h3d.scene.Object {
 
 						if(anim.rotation != null) {
 							var rotation = evaluator.getVector(anim.rotation, time, tempVec);
-							rotation.scale3(Math.PI / 180.0);
+							rotation.scale(Math.PI / 180.0);
 							m.rotate(rotation.x, rotation.y, rotation.z);
 						}
 
@@ -296,8 +296,8 @@ class FXAnimation extends h3d.scene.Object {
 			var c = Curve.getCurve(elt, name);
 			if(c != null)
 				anyFound = true;
-			
-			if (c == null) 
+
+			if (c == null)
 				return def;
 
 			return c.blendMode == CurveBlendMode.Blend ? VBlendCurve(c, blendFactor) : VCurve(c);
@@ -311,7 +311,7 @@ class FXAnimation extends h3d.scene.Object {
 			anyFound = true;
 
 			if(uniform && curves.length == 1 && curves[0].name == name) {
-				if (curves[0].blendMode == CurveBlendMode.Blend) 
+				if (curves[0].blendMode == CurveBlendMode.Blend)
 					return VBlendCurve(curves[0], blendFactor);
 
 				return scale != 1.0 ? VCurveScale(curves[0], scale) : VCurve(curves[0]);

hrt/prefab/l3d/Spline.hx

@@ -200,7 +200,7 @@ class SplinePoint extends Object3D {
 	public function getFirstControlPoint() : h3d.col.Point {
 		var absPos = getAbsPos();
 		var right = absPos.front();
-		right.scale3(scaleX*scaleY);
+		right.scale(scaleX*scaleY);
 		var pos = new h3d.col.Point(absPos.tx, absPos.ty, absPos.tz);
 		pos = pos.add(right.toPoint());
 		return pos;
@@ -209,7 +209,7 @@ class SplinePoint extends Object3D {
 	public function getSecondControlPoint() : h3d.col.Point {
 		var absPos = getAbsPos();
 		var left = absPos.front();
-		left.scale3(-scaleX*scaleZ);
+		left.scale(-scaleX*scaleZ);
 		var pos = new h3d.col.Point(absPos.tx, absPos.ty, absPos.tz);
 		pos = pos.add(left.toPoint());
 		return pos;
@@ -580,7 +580,7 @@ class Spline extends Object3D {
 	// Linear Interpolation
 	// p(t) = p0 + (p1 - p0) * t
 	inline function getLinearBezierPoint( t : Float, p0 : h3d.col.Point, p1 : h3d.col.Point ) : h3d.col.Point {
-		return p0.add((p1.sub(p0).multiply(t)));
+		return p0.add((p1.sub(p0).scaled(t)));
 	}
 	// p'(t) = (p1 - p0)
 	inline function getLinearBezierTangent( t : Float, p0 : h3d.col.Point, p1 : h3d.col.Point ) : h3d.col.Point {
@@ -590,21 +590,21 @@ class Spline extends Object3D {
 	// Quadratic Interpolation
 	// p(t) = p0 * (1 - t)² + p1 * t * 2 * (1 - t) + p2 * t²
 	inline function getQuadraticBezierPoint( t : Float, p0 : h3d.col.Point, p1 : h3d.col.Point, p2 : h3d.col.Point) : h3d.col.Point {
-		return p0.multiply((1 - t) * (1 - t)).add(p1.multiply(t * 2 * (1 - t))).add(p2.multiply(t * t));
+		return p0.scaled((1 - t) * (1 - t)).add(p1.scaled(t * 2 * (1 - t))).add(p2.scaled(t * t));
 	}
 	// p'(t) = 2 * (1 - t) * (p1 - p0) + 2 * t * (p2 - p1)
 	inline function getQuadraticBezierTangent( t : Float, p0 : h3d.col.Point, p1 : h3d.col.Point, p2 : h3d.col.Point) : h3d.col.Point {
-		return p1.sub(p0).multiply(2 * (1 - t)).add(p2.sub(p1).multiply(2 * t)).normalized();
+		return p1.sub(p0).scaled(2 * (1 - t)).add(p2.sub(p1).scaled(2 * t)).normalized();
 	}
 
 	// Cubic Interpolation
 	// p(t) = p0 * (1 - t)³ + p1 * t * 3 * (1 - t)² + p2 * t² * 3 * (1 - t) + p3 * t³
 	inline function getCubicBezierPoint( t : Float, p0 : h3d.col.Point, p1 : h3d.col.Point, p2 : h3d.col.Point, p3 : h3d.col.Point) : h3d.col.Point {
-		return p0.multiply((1 - t) * (1 - t) * (1 - t)).add(p1.multiply(t * 3 * (1 - t) * (1 - t))).add(p2.multiply(t * t * 3 * (1 - t))).add(p3.multiply(t * t * t));
+		return p0.scaled((1 - t) * (1 - t) * (1 - t)).add(p1.scaled(t * 3 * (1 - t) * (1 - t))).add(p2.scaled(t * t * 3 * (1 - t))).add(p3.scaled(t * t * t));
 	}
 	// p'(t) = 3 * (1 - t)² * (p1 - p0) + 6 * (1 - t) * t * (p2 - p1) + 3 * t² * (p3 - p2)
 	inline function getCubicBezierTangent( t : Float, p0 : h3d.col.Point, p1 : h3d.col.Point, p2 : h3d.col.Point, p3 : h3d.col.Point) : h3d.col.Point {
-		return p1.sub(p0).multiply(3 * (1 - t) * (1 - t)).add(p2.sub(p1).multiply(6 * (1 - t) * t)).add(p3.sub(p2).multiply(3 * t * t)).normalized();
+		return p1.sub(p0).scaled(3 * (1 - t) * (1 - t)).add(p2.sub(p1).scaled(6 * (1 - t) * t)).add(p3.sub(p2).scaled(3 * t * t)).normalized();
 	}
 
 	function generateSplineGraph( ctx : hrt.prefab.Context ) {

hrt/prefab/rfx/CloudShadow.hx

@@ -81,7 +81,7 @@ class CloudShadow extends RendererFX {
 				mainLight.shader = dlwc;
 				dlwc.lightDir = mainLight.pbr.lightDir;
 				dlwc.lightColor.load(mainLight._color);
-				dlwc.lightColor.scale3(mainLight.power * mainLight.power);
+				dlwc.lightColor.scale(mainLight.power * mainLight.power);
 				dlwc.occlusionFactor = mainLight.occlusionFactor;
 				var angle = angle * Math.PI / 180;
 				var speed = speed / scale;

hrt/prefab/rfx/Configurator.hx

@@ -149,7 +149,7 @@ class Configurator extends RendererFX {
 	}
 
 	function mixColor ( x : Int, y : Int, t : Float ) : Int {
-		return h3d.Vector.fromColor(x).multiply(1-t).add(h3d.Vector.fromColor(y).multiply(t)).toColor();
+		return h3d.Vector.fromColor(x).scaled(1-t).add(h3d.Vector.fromColor(y).scaled(t)).toColor();
 	}
 
 	function getParts( r : Renderer, id : String) {

hrt/prefab/rfx/GenFog.hx

@@ -159,7 +159,7 @@ class GenFog extends RendererFX {
 			else
 				fogPass.shader.lightDirection.load(@:privateAccess ls.getShadowDirection());
 			fogPass.shader.lightColor.setColor(lightColor);
-			fogPass.shader.lightColor.scale3(lightColorAmount);
+			fogPass.shader.lightColor.scale(lightColorAmount);
 			fogPass.shader.dotThreshold = hxd.Math.cos(lightAngle * Math.PI/180);
 
 			fogPass.setGlobals(ctx);

hrt/prefab/terrain/Tile.hx

@@ -145,7 +145,7 @@ class Tile extends h3d.scene.Mesh {
 			// Normal
 			var n = h3d.Vector.fromColor(normalMapPixels.getPixel(x, y));
 			n = n.add(new h3d.Vector(-0.5, -0.5, -0.5));
-			n.scale3(2.0);
+			n.scale(2.0);
 			bigPrim.addVertexValue(n.x);
 			bigPrim.addVertexValue(n.y);
 			bigPrim.addVertexValue(n.z);

hrt/prefab/vlm/ProbeBaker.hx

@@ -279,7 +279,7 @@ class ProbeBaker {
 			case 5: dir.x = -1.0 + u; dir.y = -1.0 + v;  dir.z = -1.0;
 			default:
 		}
-		dir.normalizeFast();
+		dir.normalize();
 		return dir;
 	}