update

Author: hj

dataview.go

@@ -27,6 +27,7 @@ func BufferDataView(buff *bytes.Buffer) *DataView {
 }
 
 func (dv *DataView) String() string {
+	dv.Seek(0, io.SeekStart)
 	ln := dv.Len()
 	data := make([]byte, ln)
 	_, err := dv.Read(data)
@@ -40,6 +41,8 @@ func (dv *DataView) String() string {
 
 func (dv *DataView) touint64() uint64 {
 	var i uint64
+	dv.Seek(0, io.SeekStart)
+
 	err := binary.Read(dv, binary.LittleEndian, &i)
 	if err != nil && err != io.EOF {
 		fmt.Println("binary read failure:", err)
@@ -49,6 +52,7 @@ func (dv *DataView) touint64() uint64 {
 
 func (dv *DataView) toint64() int64 {
 	var i int64
+	dv.Seek(0, io.SeekStart)
 	err := binary.Read(dv, binary.LittleEndian, &i)
 	if err != nil && err != io.EOF {
 		fmt.Println("binary read failure:", err)
@@ -58,6 +62,7 @@ func (dv *DataView) toint64() int64 {
 
 func (dv *DataView) toInt32() int32 {
 	var i int32
+	dv.Seek(0, io.SeekStart)
 	err := binary.Read(dv, binary.LittleEndian, &i)
 	if err != nil && err != io.EOF {
 		fmt.Println("binary read failure:", err)
@@ -67,6 +72,7 @@ func (dv *DataView) toInt32() int32 {
 
 func (dv *DataView) touint32() uint32 {
 	var i uint32
+	dv.Seek(0, io.SeekStart)
 	err := binary.Read(dv, binary.LittleEndian, &i)
 	if err != nil && err != io.EOF {
 		fmt.Println("binary read failure:", err)
@@ -76,6 +82,7 @@ func (dv *DataView) touint32() uint32 {
 
 func (dv *DataView) toDouble() float64 {
 	var i float64
+	dv.Seek(0, io.SeekStart)
 	err := binary.Read(dv, binary.LittleEndian, &i)
 	if err != nil && err != io.EOF {
 		fmt.Println("binary read failure:", err)
@@ -85,6 +92,7 @@ func (dv *DataView) toDouble() float64 {
 
 func (dv *DataView) toFloat() float32 {
 	var i float32
+	dv.Seek(0, io.SeekStart)
 	err := binary.Read(dv, binary.LittleEndian, &i)
 	if err != nil && err != io.EOF {
 		fmt.Println("binary read failure:", err)
@@ -94,6 +102,7 @@ func (dv *DataView) toFloat() float32 {
 
 func (dv *DataView) toBool() bool {
 	var i bool
+	dv.Seek(0, io.SeekStart)
 	err := binary.Read(dv, binary.LittleEndian, &i)
 	if err != nil && err != io.EOF {
 		fmt.Println("binary read failure:", err)

geometry.go

@@ -27,7 +27,7 @@ var vtxDataMapFromStrs = map[string]VertexDataMapping{
 // MaxUvs is the highest number of UVs allowed
 const MaxUvs = 4
 
-//Geometry is the base geometric shape objec that is implemented in forms such as meshes that dictate control point deformations
+// Geometry is the base geometric shape objec that is implemented in forms such as meshes that dictate control point deformations
 type Geometry struct {
 	Object
 	Skin *Skin
@@ -333,7 +333,6 @@ func parseGeometry(scene *Scene, element *Element) (*Geometry, error) {
 			if tmp != nil && len(tmp) > 0 {
 				//uvs = [4]floatgeom.Point2{} //resize(tmpIndices.empty() ? tmp.size() : tmpIndices.size());
 				geom.UVs[uvIdx] = splatVec2(mapping, tmp, tmpIndices, origIndices)
-				remapVec2(&geom.UVs[uvIdx], toOldIndices)
 			}
 		}
 
@@ -368,7 +367,6 @@ func parseGeometry(scene *Scene, element *Element) (*Geometry, error) {
 		}
 		if len(tmp) > 0 {
 			geom.Colors = splatVec4(mapping, tmp, tmpIndices, origIndices)
-			remapVec4(&geom.Colors, toOldIndices)
 		}
 	}
 
@@ -380,7 +378,6 @@ func parseGeometry(scene *Scene, element *Element) (*Geometry, error) {
 		}
 		if len(tmp) > 0 {
 			geom.Normals = splatVec3(mapping, tmp, tmpIndices, origIndices)
-			remapVec3(&geom.Normals, toOldIndices)
 		}
 	}
 

mesh.go

@@ -2,8 +2,6 @@ package ofbx
 
 import (
 	"fmt"
-
-	"github.com/oakmound/oak/v2/alg/floatgeom"
 )
 
 // Mesh is a geometry made of polygon
@@ -56,10 +54,10 @@ func (m *Mesh) Type() Type {
 	return MESH
 }
 
-func (m *Mesh) getGeometricMatrix() Matrix {
-	translation := resolveVec3Property(m, "GeometricTranslation", floatgeom.Point3{0, 0, 0})
-	rotation := resolveVec3Property(m, "GeometricRotation", floatgeom.Point3{0, 0, 0})
-	scale := resolveVec3Property(m, "GeometricScaling", floatgeom.Point3{1, 1, 1})
+func (m *Mesh) GetGeometricMatrix() Matrix {
+	translation := getLocalTranslation(m)
+	rotation := getLocalRotation(m)
+	scale := getLocalScaling(m)
 
 	scaleMtx := makeIdentity()
 	scaleMtx.m[0] = scale.X()

object.go

@@ -221,11 +221,13 @@ func getLocalScaling(o Obj) floatgeom.Point3 {
 
 func getGlobalTransform(o Obj) Matrix {
 	parent := getParent(o)
+	lmt := evalLocal(o, getLocalTranslation(o), getLocalRotation(o))
 	if parent == nil {
-		return evalLocal(o, getLocalTranslation(o), getLocalRotation(o))
+		return lmt
 	}
+	mt := getGlobalTransform(parent)
 
-	return getGlobalTransform(parent).Mul(evalLocal(o, getLocalTranslation(o), getLocalRotation(o)))
+	return mt.Mul(lmt)
 }
 
 func getLocalTransform(o Obj) Matrix {

print_test.go

@@ -19,3 +19,29 @@ func TestPrintScene(t *testing.T) {
 	fmt.Println(scene)
 	fmt.Println(scene.Meshes[0].Materials[0].Textures[0].relativeFilename)
 }
+
+func TestMatrix(t *testing.T) {
+	f, err := os.Open("/home/hj/snap/dukto/16/md/AOI.fbx")
+	if err != nil {
+		log.Fatal(err)
+	}
+	scene, err := Load(f)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	mt := getGlobalTransform(scene.ObjectMap[2281135157232])
+	fmt.Println(mt)
+	mt2 := getGlobalTransform(scene.ObjectMap[2281135157232])
+	fmt.Println(mt2)
+
+	for _, m := range scene.Meshes[12:] {
+		// mt := getLocalTransform(m)
+		// fmt.Println(mt)
+
+		mt2 := getGlobalTransform(m)
+		fmt.Println(mt2)
+
+	}
+
+}

texture.go

@@ -1,6 +1,6 @@
 package ofbx
 
-//TextureType determines how a texture be used
+// TextureType determines how a texture be used
 type TextureType int
 
 // Texture type block
@@ -10,7 +10,7 @@ const (
 	TextureCOUNT TextureType = iota
 )
 
-//Texture is a texture file on an object
+// Texture is a texture file on an object
 type Texture struct {
 	Object
 	filename         *DataView
@@ -42,6 +42,10 @@ func (t *Texture) getRelativeFileName() *DataView {
 	return t.relativeFilename
 }
 
+func (t *Texture) GetRelativeFileName() *DataView {
+	return t.relativeFilename
+}
+
 func (t *Texture) String() string {
 	s := "Texture: " + t.Object.String()
 	s += ", filename: " + t.filename.String()