Matrix.loadFrom -> Matrix.load and old load is now loadValues

h3d/Matrix.hx

@@ -492,14 +492,14 @@ class Matrix {
 		return m;
 	}
 
-	public function loadFrom( m : Matrix ) {
+	public function load( m : Matrix ) {
 		_11 = m._11; _12 = m._12; _13 = m._13; _14 = m._14;
 		_21 = m._21; _22 = m._22; _23 = m._23; _24 = m._24;
 		_31 = m._31; _32 = m._32; _33 = m._33; _34 = m._34;
 		_41 = m._41; _42 = m._42; _43 = m._43; _44 = m._44;
 	}
 
-	public function load( a : Array<Float> ) {
+	public function loadValues( a : Array<Float> ) {
 		_11 = a[0]; _12 = a[1]; _13 = a[2]; _14 = a[3];
 		_21 = a[4]; _22 = a[5]; _23 = a[6]; _24 = a[7];
 		_31 = a[8]; _32 = a[9]; _33 = a[10]; _34 = a[11];
@@ -686,7 +686,7 @@ class Matrix {
 
 	public static function L( a : Array<Float> ) {
 		var m = new Matrix();
-		m.load(a);
+		m.loadValues(a);
 		return m;
 	}
 

h3d/parts/GpuParticles.hx

@@ -879,7 +879,7 @@ class GpuParticles extends h3d.scene.MultiMaterial {
 				q.saveToMatrix(g.pshader.cameraRotation);
 			}
 			if( g.emitMode == CameraBounds ) {
-				g.pshader.transform.loadFrom(camera.getInverseView());
+				g.pshader.transform.load(camera.getInverseView());
 				g.pshader.offset.set( -camera.pos.x * g.emitDist, -camera.pos.y * g.emitDist, -camera.pos.z * g.emitDist );
 				g.pshader.offset.transform3x3( camera.mcam );
 				g.pshader.offset.x %= volumeBounds.xSize;

h3d/scene/Skin.hx

@@ -36,7 +36,7 @@ class Joint extends Object {
 		}
 		if( lastFrame != skin.lastFrame ) {
 			lastFrame = skin.lastFrame;
-			absPos.loadFrom(skin.currentAbsPose[index]);
+			absPos.load(skin.currentAbsPose[index]);
 			if( skin.jointsAbsPosInv != null && skin.jointsAbsPosInv._44 != 0 ) {
 				absPos.multiply3x4(absPos, skin.jointsAbsPosInv);
 				absPos.multiply3x4(absPos, parent.absPos);

h3d/shader/ColorMatrix.hx

@@ -15,7 +15,7 @@ class ColorMatrix extends hxsl.Shader {
 
 	public function new( ?m : Array<Float> ) {
 		super();
-		if( m != null ) this.matrix.load(m) else this.matrix.identity();
+		if( m != null ) this.matrix.loadValues(m) else this.matrix.identity();
 	}
 
 }