Skip to content

Commit 295d5bc

Browse files
committed
Merge branch 'feature/update_shoulder' into develop
2 parents 0187ef6 + 2abbbe1 commit 295d5bc

File tree

19 files changed

+225666
-177335
lines changed

19 files changed

+225666
-177335
lines changed

kuroko_description/meshes/kuroko/obj/chest.mtl

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Blender MTL File: 'None'
2-
# Material Count: 6
2+
# Material Count: 7
33

4-
newmtl 191,191,191
4+
newmtl 191,191,191.001
55
Ns 300.000000
66
Ka 0.749020 0.749020 0.749020
77
Kd 0.749020 0.749020 0.749020
@@ -11,7 +11,17 @@ Ni 1.000000
1111
d 1.000000
1212
illum 2
1313

14-
newmtl 235,235,235.001
14+
newmtl 217,216,233.001
15+
Ns 1000.000000
16+
Ka 0.870588 0.870588 0.870588
17+
Kd 0.850980 0.847059 0.913725
18+
Ks 1.000000 1.000000 1.000000
19+
Ke 0.000000 0.000000 0.000000
20+
Ni 1.000000
21+
d 1.000000
22+
illum 2
23+
24+
newmtl 235,235,235.002
1525
Ns 1000.000000
1626
Ka 0.921569 0.921569 0.921569
1727
Kd 0.921569 0.921569 0.921569
@@ -31,7 +41,7 @@ Ni 1.000000
3141
d 1.000000
3242
illum 2
3343

34-
newmtl 5,5,5.003
44+
newmtl 5,5,5.012
3545
Ns 1000.000000
3646
Ka 0.019608 0.019608 0.019608
3747
Kd 0.019608 0.019608 0.019608
@@ -41,7 +51,7 @@ Ni 1.000000
4151
d 1.000000
4252
illum 2
4353

44-
newmtl 64,64,64.004
54+
newmtl 64,64,64.012
4555
Ns 1000.000000
4656
Ka 0.250980 0.250980 0.250980
4757
Kd 0.250980 0.250980 0.250980
@@ -51,7 +61,7 @@ Ni 1.000000
5161
d 1.000000
5262
illum 2
5363

54-
newmtl 64,64,64_1
64+
newmtl 64,64,64_1.002
5565
Ns 1000.000000
5666
Ka 0.250980 0.250980 0.250980
5767
Kd 0.250980 0.250980 0.250980

0 commit comments

Comments
 (0)