Skip to content

Commit a6f2959

Browse files
author
udhos
committed
Linting fixes.
1 parent 6ad9de5 commit a6f2959

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/udhos/gwob
22

3-
go 1.20
3+
go 1.22.2

obj.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ func (o *Obj) ToWriter(w io.Writer) error {
504504
}
505505

506506
// NewObjFromVertex creates Obj from vertex data.
507-
func NewObjFromVertex(objName string, coord []float32, indices []int) (*Obj, error) {
507+
func NewObjFromVertex(coord []float32, indices []int) (*Obj, error) {
508508
o := &Obj{}
509509

510510
group := o.newGroup("", "", 0, 0)
@@ -574,7 +574,7 @@ func readObj(objName string, reader StringReader, options *ObjParserOptions) (*O
574574
o := &Obj{}
575575

576576
// 1. vertex-only parsing
577-
if fatal, err := readLines(p, o, reader, options); err != nil {
577+
if fatal, err := readLines(p, reader, options); err != nil {
578578
if fatal {
579579
return o, err
580580
}
@@ -586,7 +586,7 @@ func readObj(objName string, reader StringReader, options *ObjParserOptions) (*O
586586
p.normLines = 0
587587

588588
// 2. full parsing
589-
if fatal, err := scanLines(p, o, reader, options); err != nil {
589+
if fatal, err := scanLines(p, o, options); err != nil {
590590
if fatal {
591591
return o, err
592592
}
@@ -625,15 +625,15 @@ func readObj(objName string, reader StringReader, options *ObjParserOptions) (*O
625625
return o, nil
626626
}
627627

628-
func readLines(p *objParser, o *Obj, reader StringReader, options *ObjParserOptions) (bool, error) {
628+
func readLines(p *objParser, reader StringReader, options *ObjParserOptions) (bool, error) {
629629
p.lineCount = 0
630630

631631
for {
632632
p.lineCount++
633633
line, err := reader.ReadString('\n')
634634
if err == io.EOF {
635635
// parse last line
636-
if fatal, e := parseLineVertex(p, o, line, options); e != nil {
636+
if fatal, e := parseLineVertex(p, line, options); e != nil {
637637
options.log(fmt.Sprintf("readLines: %v", e))
638638
return fatal, e
639639
}
@@ -645,7 +645,7 @@ func readLines(p *objParser, o *Obj, reader StringReader, options *ObjParserOpti
645645
return ErrFatal, fmt.Errorf("readLines: error: %v", err)
646646
}
647647

648-
if fatal, e := parseLineVertex(p, o, line, options); e != nil {
648+
if fatal, e := parseLineVertex(p, line, options); e != nil {
649649
options.log(fmt.Sprintf("readLines: %v", e))
650650
if fatal {
651651
return fatal, e
@@ -657,7 +657,7 @@ func readLines(p *objParser, o *Obj, reader StringReader, options *ObjParserOpti
657657
}
658658

659659
// parseLineVertex: parse only vertex lines
660-
func parseLineVertex(p *objParser, o *Obj, rawLine string, options *ObjParserOptions) (bool, error) {
660+
func parseLineVertex(p *objParser, rawLine string, options *ObjParserOptions) (bool, error) {
661661
line := strings.TrimSpace(rawLine)
662662

663663
p.lineBuf = append(p.lineBuf, line) // save line for 2nd pass
@@ -721,7 +721,7 @@ func parseLineVertex(p *objParser, o *Obj, rawLine string, options *ObjParserOpt
721721
return ErrNonFatal, nil
722722
}
723723

724-
func scanLines(p *objParser, o *Obj, reader StringReader, options *ObjParserOptions) (bool, error) {
724+
func scanLines(p *objParser, o *Obj, options *ObjParserOptions) (bool, error) {
725725

726726
p.currGroup = o.newGroup("", "", 0, 0)
727727

obj_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestWriteEmpty(t *testing.T) {
130130
func TestWriteBad(t *testing.T) {
131131

132132
// load
133-
orig, err := NewObjFromVertex("bad", []float32{}, []int{0})
133+
orig, err := NewObjFromVertex([]float32{}, []int{0})
134134
if err != nil {
135135
t.Errorf("TestWriteBad: NewObjFromVertex: %v", err)
136136
return

0 commit comments

Comments
 (0)