Browse Source

fixed some warnings wrt haxe git

Nicolas Cannasse 5 years ago
parent
commit
904199b00c
5 changed files with 41 additions and 45 deletions
  1. 0 6
      all.hxml
  2. 1 0
      h2d/KeyFrames.hx
  3. 4 4
      h3d/Matrix.hx
  4. 32 32
      h3d/Quat.hx
  5. 4 3
      hxd/fmt/pak/FileSystem.hx

+ 0 - 6
all.hxml

@@ -13,12 +13,6 @@
 
 --next
 
--swf heaps.swf
--swf-version 15
--xml heaps_swf.xml
-
---next
-
 -hl heaps.hl
 -lib hlsdl
 -lib hlopenal

+ 1 - 0
h2d/KeyFrames.hx

@@ -128,6 +128,7 @@ class KeyFrames extends Mask {
 				xVal = (curFrame - cur.start_frame) / yVal;
 			} else {
 				next = cur;
+				yVal = 1;
 				xVal = 0.;
 			}
 		} else {

+ 4 - 4
h3d/Matrix.hx

@@ -602,10 +602,10 @@ class Matrix {
 
 	public function colorSaturate( sat : Float ) {
 		sat += 1;
-		var is = 1 - sat;
-		var r = is * lumR;
-		var g = is * lumG;
-		var b = is * lumB;
+		var ins = 1 - sat;
+		var r = ins * lumR;
+		var g = ins * lumG;
+		var b = ins * lumB;
 		var tmp = tmp;
 		tmp._11 = r + sat;
 		tmp._12 = r;

+ 32 - 32
h3d/Quat.hx

@@ -76,32 +76,32 @@ class Quat {
 		var tr = ax.x + ay.y + az.z;
 		if( tr > 0 ) {
 			var s = (tr + 1.0).sqrt() * 2;
-			var is = 1 / s;
-			x = (ay.z - az.y) * is;
-			y = (az.x - ax.z) * is;
-			z = (ax.y - ay.x) * is;
+			var ins = 1 / s;
+			x = (ay.z - az.y) * ins;
+			y = (az.x - ax.z) * ins;
+			z = (ax.y - ay.x) * ins;
 			w = 0.25 * s;
 		} else if( ax.x > ay.y && ax.x > az.z ) {
 			var s = (1.0 + ax.x - ay.y - az.z).sqrt() * 2;
-			var is = 1 / s;
+			var ins = 1 / s;
 			x = 0.25 * s;
-			y = (ay.x + ax.y) * is;
-			z = (az.x + ax.z) * is;
-			w = (ay.z - az.y) * is;
+			y = (ay.x + ax.y) * ins;
+			z = (az.x + ax.z) * ins;
+			w = (ay.z - az.y) * ins;
 		} else if( ay.y > az.z ) {
 			var s = (1.0 + ay.y - ax.x - az.z).sqrt() * 2;
-			var is = 1 / s;
-			x = (ay.x + ax.y) * is;
+			var ins = 1 / s;
+			x = (ay.x + ax.y) * ins;
 			y = 0.25 * s;
-			z = (az.y + ay.z) * is;
-			w = (az.x - ax.z) * is;
+			z = (az.y + ay.z) * ins;
+			w = (az.x - ax.z) * ins;
 		} else {
 			var s = (1.0 + az.z - ax.x - ay.y).sqrt() * 2;
-			var is = 1 / s;
-			x = (az.x + ax.z) * is;
-			y = (az.y + ay.z) * is;
+			var ins = 1 / s;
+			x = (az.x + ax.z) * ins;
+			y = (az.y + ay.z) * ins;
 			z = 0.25 * s;
-			w = (ax.y - ay.x) * is;
+			w = (ax.y - ay.x) * ins;
 		}
 	}
 
@@ -119,32 +119,32 @@ class Quat {
 		var tr = m._11 + m._22 + m._33;
 		if( tr > 0 ) {
 			var s = (tr + 1.0).sqrt() * 2;
-			var is = 1 / s;
-			x = (m._23 - m._32) * is;
-			y = (m._31 - m._13) * is;
-			z = (m._12 - m._21) * is;
+			var ins = 1 / s;
+			x = (m._23 - m._32) * ins;
+			y = (m._31 - m._13) * ins;
+			z = (m._12 - m._21) * ins;
 			w = 0.25 * s;
 		} else if( m._11 > m._22 && m._11 > m._33 ) {
 			var s = (1.0 + m._11 - m._22 - m._33).sqrt() * 2;
-			var is = 1 / s;
+			var ins = 1 / s;
 			x = 0.25 * s;
-			y = (m._21 + m._12) * is;
-			z = (m._31 + m._13) * is;
-			w = (m._23 - m._32) * is;
+			y = (m._21 + m._12) * ins;
+			z = (m._31 + m._13) * ins;
+			w = (m._23 - m._32) * ins;
 		} else if( m._22 > m._33 ) {
 			var s = (1.0 + m._22 - m._11 - m._33).sqrt() * 2;
-			var is = 1 / s;
-			x = (m._21 + m._12) * is;
+			var ins = 1 / s;
+			x = (m._21 + m._12) * ins;
 			y = 0.25 * s;
-			z = (m._32 + m._23) * is;
-			w = (m._31 - m._13) * is;
+			z = (m._32 + m._23) * ins;
+			w = (m._31 - m._13) * ins;
 		} else {
 			var s = (1.0 + m._33 - m._11 - m._22).sqrt() * 2;
-			var is = 1 / s;
-			x = (m._31 + m._13) * is;
-			y = (m._32 + m._23) * is;
+			var ins = 1 / s;
+			x = (m._31 + m._13) * ins;
+			y = (m._32 + m._23) * ins;
 			z = 0.25 * s;
-			w = (m._12 - m._21) * is;
+			w = (m._12 - m._21) * ins;
 		}
 	}
 

+ 4 - 3
hxd/fmt/pak/FileSystem.hx

@@ -5,14 +5,15 @@ import hxd.impl.Air3File;
 #elseif (sys || nodejs)
 import sys.io.File;
 import sys.io.FileInput;
+typedef FileSeekMode = sys.io.FileSeek;
 #else
-enum FileSeek {
+enum FileSeekMode {
 	SeekBegin;
 	SeekEnd;
 	SeedCurrent;
 }
 class FileInput extends haxe.io.BytesInput {
-	public function seek( pos : Int, seekMode : FileSeek ) {
+	public function seek( pos : Int, seekMode : FileSeekMode ) {
 		switch( seekMode ) {
 		case SeekBegin:
 			this.position = pos;
@@ -30,7 +31,7 @@ class FileSeek {
 	@:hlNative("std","file_seek2") static function seek2( f : sys.io.File.FileHandle, pos : Float, cur : Int ) : Bool { return false; }
 	#end
 	
-	public static function seek( f : sys.io.FileInput, pos : Float, mode : sys.io.FileSeek ) {
+	public static function seek( f : FileInput, pos : Float, mode : FileSeekMode ) {
 		#if (hl && hl_ver >= version("1.12.0"))
 		if( !seek2(@:privateAccess f.__f,pos,mode.getIndex()) )
 			throw haxe.io.Error.Custom("seek2 failure()");