ncannasse %!s(int64=9) %!d(string=hai) anos
pai
achega
07dec75260
Modificáronse 2 ficheiros con 18 adicións e 2 borrados
  1. 16 2
      h3d/impl/LogDriver.hx
  2. 2 0
      tools/fbx/Viewer.hx

+ 16 - 2
h3d/impl/LogDriver.hx

@@ -221,12 +221,12 @@ class LogDriver extends Driver {
 			inline function logVars( s : hxsl.RuntimeShader.RuntimeShaderData, buf : h3d.shader.Buffers.ShaderBuffers ) {
 				var t = s.textures2D;
 				while( t != null ) {
-					log('Set ${s.vertex ? "Vertex" : "Fragment"} Texture@${t.pos} ' + t.name+"=" + (buf.tex.length <= t.pos ? 'OUT OF BOUNDS' : '' + buf.tex[t.pos]));
+					log('Set ${s.vertex ? "Vertex" : "Fragment"} Texture@${t.pos} ' + t.name+"=" + textureInfos(buf.tex,t.pos));
 					t = t.next;
 				}
 				t = s.texturesCube;
 				while( t != null ) {
-					log('Set ${s.vertex ? "Vertex" : "Fragment"} TextureCube@${t.pos} ' + t.name+"=" + (buf.tex.length <= t.pos ? 'OUT OF BOUNDS' : '' + buf.tex[t.pos + s.textures2DCount]));
+					log('Set ${s.vertex ? "Vertex" : "Fragment"} TextureCube@${t.pos} ' + t.name+"=" + textureInfos(buf.tex,t.pos + s.textures2DCount));
 					t = t.next;
 				}
 			}
@@ -236,6 +236,20 @@ class LogDriver extends Driver {
 		d.uploadShaderBuffers(buffers, which);
 	}
 
+	function textureInfos( buf : haxe.ds.Vector<h3d.mat.Texture>, tid : Int ) {
+		if( tid < 0 || tid >= buf.length )
+			return 'OUT OF BOUNDS';
+		var t = buf[tid];
+		if( t == null )
+			return 'NULL';
+		var inf = '' + t;
+		if( t.wrap != Clamp )
+			inf += " wrap=" + t.wrap;
+		if( t.mipMap != None )
+			inf += " mip=" + t.mipMap;
+		return inf;
+	}
+
 	override function getShaderInputNames() : Array<String> {
 		return d.getShaderInputNames();
 	}

+ 2 - 0
tools/fbx/Viewer.hx

@@ -440,6 +440,8 @@ class Viewer extends hxd.App {
 			obj = curHmd.makeObject(function(name) {
 				var t = new h3d.mat.Texture(1, 1);
 				t.clear(0xFF00FF);
+				t.wrap = Repeat;
+				t.setName(name);
 				loadTexture(name, new h3d.mat.MeshMaterial(t));
 				return t;
 			});