remove legacy direct fbx support

h3d/prim/FBXModel.hx

@@ -1,294 +0,0 @@
-package h3d.prim;
-using hxd.fmt.fbx.Data;
-import h3d.Buffer.BufferOffset;
-import h3d.col.Point;
-
-class FBXModel extends MeshPrimitive {
-
-	public var geom(default, null) : hxd.fmt.fbx.Geometry;
-	public var skin : h3d.anim.Skin;
-	public var multiMaterial : Bool;
-	var bounds : h3d.col.Bounds;
-	var curMaterial : Int;
-	var groupIndexes : Array<Indexes>;
-	var viewNormals : Bool;
-	var tcount = -1;
-
-	public function new(g) {
-		this.geom = g;
-		curMaterial = -1;
-	}
-
-	override public function triCount() {
-		if( buffer != null ) return super.triCount();
-		if( tcount < 0 ) tcount = Std.int(geom.getIndexes().idx.length / 3);
-		return tcount;
-	}
-
-	public function setSkin(skin) {
-		this.skin = skin;
-		skin.primitive = this;
-	}
-
-	override function vertexCount() {
-		return triCount() * 3; // vertices are always duplicated
-	}
-
-	override function getBounds() {
-		if( bounds != null )
-			return bounds;
-		bounds = new h3d.col.Bounds();
-		var verts = geom.getVertices();
-		var gm = geom.getGeomMatrix();
-		var tmp = new h3d.col.Point();
-		if( verts.length > 0 ) {
-			tmp.set(verts[0], verts[1], verts[2]);
-			if( gm != null ) tmp.transform(gm);
-			bounds.xMin = bounds.xMax = tmp.x;
-			bounds.yMin = bounds.yMax = tmp.y;
-			bounds.zMin = bounds.zMax = tmp.z;
-		}
-		var pos = 3;
-		for( i in 1...Std.int(verts.length / 3) ) {
-			var x = verts[pos++];
-			var y = verts[pos++];
-			var z = verts[pos++];
-			if( gm != null ) {
-				tmp.set(x, y, z);
-				tmp.transform(gm);
-				x = tmp.x;
-				y = tmp.y;
-				z = tmp.z;
-			}
-			if( x > bounds.xMax ) bounds.xMax = x;
-			if( x < bounds.xMin ) bounds.xMin = x;
-			if( y > bounds.yMax ) bounds.yMax = y;
-			if( y < bounds.yMin ) bounds.yMin = y;
-			if( z > bounds.zMax ) bounds.zMax = z;
-			if( z < bounds.zMin ) bounds.zMin = z;
-		}
-		return bounds;
-	}
-
-	override function render( engine : h3d.Engine ) {
-		if( curMaterial < 0 ) {
-			super.render(engine);
-			return;
-		}
-		if( indexes == null || indexes.isDisposed() )
-			alloc(engine);
-		var idx = indexes;
-		indexes = groupIndexes[curMaterial];
-		if( indexes != null ) super.render(engine);
-		indexes = idx;
-		curMaterial = -1;
-	}
-
-	override function selectMaterial( material : Int ) {
-		curMaterial = material;
-	}
-
-	override function dispose() {
-		super.dispose();
-		if( groupIndexes != null ) {
-			for( i in groupIndexes )
-				if( i != null )
-					i.dispose();
-			groupIndexes = null;
-		}
-	}
-
-	override function buildNormalsDisplay() {
-		var m = new FBXModel(geom);
-		m.viewNormals = true;
-		if( geom.getNormals() == null ) throw "Missing normals";
-		return m;
-	}
-
-	override function alloc( engine : h3d.Engine ) {
-		dispose();
-
-		var verts = geom.getVertices();
-		var norms = geom.getNormals();
-		var tuvs = geom.getUVs()[0];
-		var colors = geom.getColors();
-		var mats = multiMaterial ? geom.getMaterials() : null;
-		var gm = geom.getGeomMatrix();
-		var tmp = new h3d.col.Point();
-
-		var idx = new hxd.IndexBuffer();
-		var midx = new Array<hxd.IndexBuffer>();
-		var pbuf = new hxd.FloatBuffer(), nbuf = (norms == null ? null : new hxd.FloatBuffer()), sbuf = (skin == null ? null : new hxd.BytesBuffer()), tbuf = (tuvs == null ? null : new hxd.FloatBuffer());
-		var cbuf = (colors == null ? null : new hxd.FloatBuffer());
-
-		if( viewNormals ) {
-			tbuf = new hxd.FloatBuffer();
-			cbuf = null;
-		}
-
-		// skin split
-		var sidx = null, stri = 0;
-		if( skin != null && skin.isSplit() )
-			sidx = [for( _ in skin.splitJoints ) new hxd.IndexBuffer()];
-
-		// triangulize indexes : format is  A,B,...,-X : negative values mark the end of the polygon
-		var count = 0, pos = 0, matPos = 0;
-		var index = geom.getPolygons();
-		for( i in index ) {
-			count++;
-			if( i < 0 ) {
-				index[pos] = -i - 1;
-				var start = pos - count + 1;
-				for( n in 0...count ) {
-					var k = n + start;
-					var vidx = index[k];
-
-					var x = verts[vidx * 3];
-					var y = verts[vidx * 3 + 1];
-					var z = verts[vidx * 3 + 2];
-					if( gm != null ) {
-						tmp.set(x, y, z);
-						tmp.transform(gm);
-						x = tmp.x;
-						y = tmp.y;
-						z = tmp.z;
-					}
-					pbuf.push(x);
-					pbuf.push(y);
-					pbuf.push(z);
-
-					if( nbuf != null ) {
-						var nx = norms[k * 3];
-						var ny = norms[k * 3 + 1];
-						var nz = norms[k * 3 + 2];
-						nbuf.push(nx);
-						nbuf.push(ny);
-						nbuf.push(nz);
-
-						if( viewNormals ) {
-							for( i in 0...3 ) {
-								pbuf.push(x);
-								pbuf.push(y);
-								pbuf.push(z);
-
-								nbuf.push(nx);
-								nbuf.push(ny);
-								nbuf.push(nz);
-							}
-						}
-					}
-
-					if( tbuf != null ) {
-						if( viewNormals ) {
-							tbuf.push(0);
-							tbuf.push(0);
-							tbuf.push(1);
-							tbuf.push(0);
-							tbuf.push(0);
-							tbuf.push(1);
-							tbuf.push(1);
-							tbuf.push(1);
-						} else {
-							var iuv = tuvs.index[k];
-							tbuf.push(tuvs.values[iuv*2]);
-							tbuf.push(1 - tuvs.values[iuv * 2 + 1]);
-						}
-					}
-
-					if( sbuf != null ) {
-						var p = vidx * skin.bonesPerVertex;
-						for( i in 0...(viewNormals ? 4 : 1) ) {
-							var idx = 0;
-							for( i in 0...skin.bonesPerVertex ) {
-								sbuf.writeFloat(skin.vertexWeights[p + i]);
-								idx = (skin.vertexJoints[p + i] << (8*i)) | idx;
-							}
-							sbuf.writeInt32(idx);
-						}
-					}
-
-					if( cbuf != null ) {
-						var icol = colors.index[k];
-						cbuf.push(colors.values[icol * 4]);
-						cbuf.push(colors.values[icol * 4 + 1]);
-						cbuf.push(colors.values[icol * 4 + 2]);
-					}
-				}
-
-
-				if( viewNormals ) {
-					for( n in 0...count - 2 ) {
-						inline function addQuad(k) {
-							idx.push(k * 4);
-							idx.push(k * 4 + 1);
-							idx.push(k * 4 + 2);
-							idx.push(k * 4 + 1);
-							idx.push(k * 4 + 3);
-							idx.push(k * 4 + 2);
-						}
-						addQuad(start + n);
-						addQuad(start + count - 1);
-						addQuad(start + n + 1);
-					}
-				} else {
-					// polygons are actually triangle fans
-					for( n in 0...count - 2 ) {
-						idx.push(start + n);
-						idx.push(start + count - 1);
-						idx.push(start + n + 1);
-					}
-				}
-				// by-skin-group index
-				if( skin != null && skin.isSplit() ) {
-					for( n in 0...count - 2 ) {
-						var idx = sidx[skin.triangleGroups[stri++]];
-						idx.push(start + n);
-						idx.push(start + count - 1);
-						idx.push(start + n + 1);
-					}
-				}
-				// by-material index
-				else if( mats != null ) {
-					var mid = mats[matPos++];
-					var idx = midx[mid];
-					if( idx == null ) {
-						idx = new hxd.IndexBuffer();
-						midx[mid] = idx;
-					}
-					for( n in 0...count - 2 ) {
-						idx.push(start + n);
-						idx.push(start + count - 1);
-						idx.push(start + n + 1);
-					}
-				}
-				index[pos] = i; // restore
-				count = 0;
-			}
-			pos++;
-		}
-
-		addBuffer("position", h3d.Buffer.ofFloats(pbuf, 3));
-		if( nbuf != null ) addBuffer("normal", h3d.Buffer.ofFloats(nbuf, 3));
-		if( tbuf != null ) addBuffer("uv", h3d.Buffer.ofFloats(tbuf, 2));
-		if( sbuf != null ) {
-			var nverts = Std.int(sbuf.length / ((skin.bonesPerVertex + 1) * 4));
-			var skinBuf = new h3d.Buffer(nverts, skin.bonesPerVertex + 1);
-			skinBuf.uploadBytes(sbuf.getBytes(), 0, nverts);
-			addBuffer("weights", skinBuf, 0);
-			addBuffer("indexes", skinBuf, skin.bonesPerVertex);
-		}
-		if( cbuf != null ) addBuffer("color", h3d.Buffer.ofFloats(cbuf, 3));
-
-		indexes = h3d.Indexes.alloc(idx);
-		if( sidx != null ) {
-			groupIndexes = [];
-			for( i in sidx )
-				groupIndexes.push(i == null ? null : h3d.Indexes.alloc(i));
-		} else if( mats != null ) {
-			groupIndexes = [];
-			for( i in midx )
-				groupIndexes.push(i == null ? null : h3d.Indexes.alloc(i));
-		}
-	}
-
-}

hxd/fmt/fbx/Library.hx

@@ -1,148 +0,0 @@
-package hxd.fmt.fbx;
-using hxd.fmt.fbx.Data;
-
-class Library extends BaseLibrary {
-
-	public function makeObject( ?textureLoader : String -> FbxNode -> h3d.mat.Material ) : h3d.scene.Object {
-		var scene = new h3d.scene.Object();
-		var hgeom = new Map();
-		var hskins = new Map();
-
-		if( textureLoader == null ) {
-			var tmpTex = null;
-			textureLoader = function(_,_) {
-				if( tmpTex == null )
-					tmpTex = h3d.mat.Texture.fromColor(0xFF00FF);
-				return h3d.mat.Material.create(tmpTex);
-			}
-		}
-
-		autoMerge();
-
-		var hier = buildHierarchy();
-		var objects = hier.objects;
-		hier.root.obj = scene;
-
-		// create all models
-		for( o in objects ) {
-			var name = o.model.getName();
-			if( o.isMesh ) {
-				if( o.isJoint )
-					throw "Model " + getModelPath(o.model) + " was tagged as joint but is mesh";
-				// load geometry
-				var g = getChild(o.model, "Geometry");
-				var prim = hgeom.get(g.getId());
-				if( prim == null ) {
-					prim = new h3d.prim.FBXModel(new Geometry(this, g));
-					hgeom.set(g.getId(), prim);
-				}
-				// load materials
-				var mats = getChilds(o.model, "Material");
-				var tmats = [];
-				var vcolor = prim.geom.getColors() != null;
-				var lastAdded = 0;
-				for( mat in mats ) {
-					var tex = getChilds(mat, "Texture")[0];
-					if( tex == null ) {
-						tmats.push(null);
-						continue;
-					}
-					var mat = textureLoader(tex.get("FileName").props[0].toString(),mat);
-					if( vcolor && allowVertexColor )
-						mat.mainPass.addShader(new h3d.shader.VertexColor());
-					tmats.push(mat);
-					lastAdded = tmats.length;
-				}
-				while( tmats.length > lastAdded )
-					tmats.pop();
-				if( tmats.length == 0 )
-					tmats.push(h3d.mat.Material.create(h3d.mat.Texture.fromColor(0xFF00FF)));
-				// create object
-				if( tmats.length == 1 )
-					o.obj = new h3d.scene.Mesh(prim, tmats[0], scene);
-				else {
-					prim.multiMaterial = true;
-					o.obj = new h3d.scene.MultiMaterial(prim, tmats, scene);
-				}
-			} else if( o.isJoint ) {
-				var j = new h3d.anim.Skin.Joint();
-				getDefaultMatrixes(o.model); // store for later usage in animation
-				j.index = o.model.getId();
-				j.name = o.model.getName();
-				o.joint = j;
-				continue;
-			} else {
-				var hasJoint = false;
-				for( c in o.childs )
-					if( c.isJoint ) {
-						hasJoint = true;
-						break;
-					}
-				if( hasJoint )
-					o.obj = new h3d.scene.Skin(null);
-				else
-					o.obj = new h3d.scene.Object();
-			}
-			o.obj.name = name;
-			var m = getDefaultMatrixes(o.model);
-			if( m.trans != null || m.rotate != null || m.scale != null || m.preRot != null )
-				o.obj.defaultTransform = m.toMatrix(leftHand);
-		}
-		// rebuild scene hierarchy
-		for( o in objects ) {
-			if( o.isJoint ) {
-				if( o.parent.isJoint ) {
-					o.joint.parent = o.parent.joint;
-					o.parent.joint.subs.push(o.joint);
-				}
-			} else {
-				// put it into the first non-joint parent
-				var p = o.parent;
-				while( p.obj == null )
-					p = p.parent;
-				p.obj.addChild(o.obj);
-			}
-		}
-		// build skins
-		var hgeom = [for( k in hgeom.keys() ) k => (hgeom.get(k) : {function vertexCount():Int;function setSkin(s:h3d.anim.Skin):Void;})];
-		for( o in objects ) {
-			if( o.isJoint ) continue;
-
-
-			// /!\ currently, childs of joints will work but will not cloned
-			if( o.parent.isJoint )
-				o.obj.follow = scene.getObjectByName(o.parent.joint.name);
-
-			var skin = hxd.impl.Api.downcast(o.obj, h3d.scene.Skin);
-			if( skin == null ) continue;
-			var rootJoints = [];
-			for( j in o.childs )
-				if( j.isJoint )
-					rootJoints.push(j.joint);
-			var skinData = createSkin(hskins, hgeom, rootJoints, bonesPerVertex);
-			// remove the corresponding Geometry-Model and copy its material
-			for( o2 in objects ) {
-				if( o2.obj == null || o2 == o || !o2.obj.isMesh() ) continue;
-				var m = o2.obj.toMesh();
-				if( m.primitive != skinData.primitive ) continue;
-
-				var mt = hxd.impl.Api.downcast(m, h3d.scene.MultiMaterial);
-				skin.materials = mt == null ? [m.material] : mt.materials;
-				skin.material = skin.materials[0];
-				m.remove();
-				// ignore key frames for this object
-				// defaultModelMatrixes.get(m.name).wasRemoved = o.model.getId();
-			}
-			// set skin after materials
-			if( skinData.boundJoints.length > BaseLibrary.maxBonesPerSkin ) {
-				var model = hxd.impl.Api.downcast(skinData.primitive, h3d.prim.FBXModel);
-				var idx = model.geom.getIndexes();
-				skinData.split(BaseLibrary.maxBonesPerSkin, [for( i in idx.idx) idx.vidx[i]], model.multiMaterial ? model.geom.getMaterialByTriangle() : null);
-			}
-			skin.setSkinData(skinData);
-		}
-
-		return scene.numChildren == 1 ? scene.getChildAt(0) : scene;
-	}
-
-}