Skip to content

Commit d5c779d

Browse files
author
Bernardo de Oliveira Bruning
committed
fix error obj loader
1 parent 5882119 commit d5c779d

3 files changed

Lines changed: 28 additions & 23 deletions

File tree

loader/obj/cube.obj

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
# www.blender.org
33
mtllib cube.mtl
44
o Cube
5-
v 1.000000 -1.000000 -1.000000
6-
v 1.000000 -1.000000 1.000000
7-
v -1.000000 -1.000000 1.000000
8-
v -1.000000 -1.000000 -1.000000
9-
v 1.000000 1.000000 -0.999999
10-
v 0.999999 1.000000 1.000001
11-
v -1.000000 1.000000 1.000000
12-
v -1.000000 1.000000 -1.000000
13-
vt 1.000000 0.333333
14-
vt 1.000000 0.666667
5+
v 100.000000 0.000000 0.000000
6+
v 100.000000 0.000000 100.000000
7+
v 0.000000 0.000000 100.000000
8+
v 0.000000 0.000000 0.000000
9+
v 100.000000 100.000000 -0.999999
10+
v 0.999999 100.000000 1.000001
11+
v 0.000000 100.000000 100.000000
12+
v 0.000000 100.000000 0.000000
13+
vt 100.000000 0.333333
14+
vt 100.000000 0.666667
1515
vt 0.666667 0.666667
1616
vt 0.666667 0.333333
1717
vt 0.666667 0.000000
1818
vt 0.000000 0.333333
1919
vt 0.000000 0.000000
2020
vt 0.333333 0.000000
21-
vt 0.333333 1.000000
22-
vt 0.000000 1.000000
21+
vt 0.333333 100.000000
22+
vt 0.000000 100.000000
2323
vt 0.000000 0.666667
2424
vt 0.333333 0.333333
2525
vt 0.333333 0.666667
26-
vt 1.000000 0.000000
27-
vn 0.000000 -1.000000 0.000000
28-
vn 0.000000 1.000000 0.000000
29-
vn 1.000000 0.000000 0.000000
30-
vn -0.000000 0.000000 1.000000
31-
vn -1.000000 -0.000000 -0.000000
32-
vn 0.000000 0.000000 -1.000000
26+
vt 100.000000 0.000000
27+
vn 0.000000 0.000000 0.000000
28+
vn 0.000000 100.000000 0.000000
29+
vn 100.000000 0.000000 0.000000
30+
vn -0.000000 0.000000 100.000000
31+
vn 0.000000 -0.000000 -0.000000
32+
vn 0.000000 0.000000 0.000000
3333
usemtl Material
3434
s off
3535
f 2/1/1 3/2/1 4/3/1

loader/obj/obj.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func Load(r io.Reader) (render.Mesh, error) {
4949
return render.Mesh{}, errors.New("Invalid load face")
5050
}
5151
a := strings.Split(obj[1], "/")
52-
b := strings.Split(obj[1], "/")
53-
c := strings.Split(obj[1], "/")
52+
b := strings.Split(obj[2], "/")
53+
c := strings.Split(obj[3], "/")
5454

5555
ai, err := strconv.Atoi(a[0])
5656
if err != nil {

loader/obj/obj_test.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package obj_test
22

33
import (
4-
"github.com/bernardo-bruning/termrender/loader/obj"
54
"os"
65
"testing"
6+
7+
"github.com/bernardo-bruning/termrender/loader/obj"
78
)
89

910
func TestLoad(t *testing.T) {
@@ -12,8 +13,12 @@ func TestLoad(t *testing.T) {
1213
t.Error(err)
1314
}
1415

15-
_, err = obj.Load(file)
16+
mesh, err := obj.Load(file)
1617
if err != nil {
1718
t.Error(err)
1819
}
20+
21+
if len(mesh.Triangles) != 12 {
22+
t.Error("Number of triangles is invalid!")
23+
}
1924
}

0 commit comments

Comments
 (0)