Skip to content

Commit 16db74a

Browse files
buhmanbuhman
committed
rename UntitledModel to CubeModel
1 parent 5545ffc commit 16db74a

File tree

6 files changed

+48
-10
lines changed

6 files changed

+48
-10
lines changed

‎Makefile.dreamcast.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jvm.iso: boot.bin main.bin zero.bin
8282
/=$(LIB)/ABSTRACT.TXT \
8383
/=$(LIB)/BIBLIOGR.TXT \
8484
example/GdromDirectoryRecordHandler.class \
85-
example/GdromTest.class \
85+
example/GdromClassLoader.class \
8686
filesystem/iso9660/ByteParser.class \
8787
filesystem/iso9660/DirectoryRecord.class \
8888
filesystem/iso9660/ExtentReader.class \
@@ -111,7 +111,7 @@ jvm.iso: boot.bin main.bin zero.bin
111111
example/JavaCubeDirectoryRecordHandler.class \
112112
model/FacePTN.class \
113113
model/ModelObject.class \
114-
model/UntitledModel.class \
114+
model/CubeModel.class \
115115
model/Vec2.class \
116116
model/Vec3.class \
117117
sega/dreamcast/holly/Background.class \

‎cube.obj

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Blender 4.1.1
2+
# www.blender.org
3+
mtllib cube.mtl
4+
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 -1.000000
10+
v -1.000000 -1.000000 -1.000000
11+
v -1.000000 1.000000 1.000000
12+
v -1.000000 -1.000000 1.000000
13+
vn -0.0000 1.0000 -0.0000
14+
vn -0.0000 -0.0000 1.0000
15+
vn -1.0000 -0.0000 -0.0000
16+
vn -0.0000 -1.0000 -0.0000
17+
vn 1.0000 -0.0000 -0.0000
18+
vn -0.0000 -0.0000 -1.0000
19+
vt 1.000000 0.000000
20+
vt 0.000000 0.500000
21+
vt 0.000000 0.000000
22+
vt 1.000000 0.500000
23+
vt 0.000000 1.000000
24+
vt 1.000000 1.000000
25+
s 0
26+
usemtl Material
27+
f 5/1/1 3/2/1 1/3/1
28+
f 3/1/2 8/2/2 4/3/2
29+
f 7/4/3 6/5/3 8/2/3
30+
f 2/1/4 8/2/4 6/3/4
31+
f 1/4/5 4/5/5 2/2/5
32+
f 5/1/6 2/2/6 6/3/6
33+
f 5/1/1 7/4/1 3/2/1
34+
f 3/1/2 7/4/2 8/2/2
35+
f 7/4/3 5/6/3 6/5/3
36+
f 2/1/4 4/4/4 8/2/4
37+
f 1/4/5 3/6/5 4/5/5
38+
f 5/1/6 1/4/6 2/2/6

‎example/JavaCube.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import sega.dreamcast.holly.VideoOutput;
1616
import sega.dreamcast.holly.VideoOutputMode;
1717
import sega.dreamcast.MemoryMap;
18-
import model.UntitledModel;
18+
import model.CubeModel;
1919
import model.Vec3;
2020
import model.Vec2;
2121
import model.FacePTN;
@@ -286,9 +286,9 @@ public static void transfer_cube_scene() {
286286
Memory.putSQ1(gt0[0], MemoryMap.ta_fifo_polygon_converter);
287287

288288
// triangle parameters
289-
ModelObject obj = UntitledModel.objects[0];
289+
ModelObject obj = CubeModel.objects[0];
290290
for (int i = 0; i < obj.faces.length; i ++) {
291-
transform_triangle(i, UntitledModel.position, UntitledModel.texture, obj.faces[i]);
291+
transform_triangle(i, CubeModel.position, CubeModel.texture, obj.faces[i]);
292292
}
293293

294294
// end of list

‎generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ python regs/bits_gen.py ../dreamcast/regs/core_bits.csv holly CoreBits >
1313
python regs/bits_gen.py ../dreamcast/regs/ta_bits.csv holly TABits > sega/dreamcast/holly/TABits.java
1414
python regs/bits_gen.py ../dreamcast/regs/isp_tsp.csv holly ISPTSP > sega/dreamcast/holly/ISPTSP.java
1515
python regs/bits_gen.py ../dreamcast/regs/ta_parameter.csv holly TAParameter > sega/dreamcast/holly/TAParameter.java
16-
python regs/bits_gen.py ..//dreamcast/regs/gdrom_bits.csv gdrom GdromBits > sega/dreamcast/gdrom/GdromBits.java
16+
python regs/bits_gen.py ../dreamcast/regs/gdrom_bits.csv gdrom GdromBits > sega/dreamcast/gdrom/GdromBits.java
1717

1818
python regs/bits_gen.py ../dreamcast/regs/systembus_bits.csv systembus SystembusBits > sega/dreamcast/systembus/SystembusBits.java
1919

2020
python regs/ta_parameters.py ../dreamcast/regs/vertex_parameter_format.csv holly TAVertexParameter > sega/dreamcast/holly/TAVertexParameter.java
2121
python regs/ta_parameters.py ../dreamcast/regs/global_parameter_format.csv holly TAGlobalParameter > sega/dreamcast/holly/TAGlobalParameter.java
2222

23-
PYTHONPATH=./regs/ python ../model_generator/generate_java.py ../untitled.obj UntitledModel > ./model/UntitledModel.java
23+
PYTHONPATH=./regs/ python ../model_generator/generate_java.py cube.obj CubeModel > ./model/CubeModel.java
2424

2525
python images/color_convert.py images/java_cup.png argb4444 images/java_cup.data
2626
python images/color_convert.py images/java_text.png argb4444 images/java_text.data

‎generate_classpath.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ declare -a application_classes=(
124124
example/JavaCube.class
125125
model/FacePTN.class
126126
model/ModelObject.class
127-
model/UntitledModel.class
127+
model/CubeModel.class
128128
model/Vec2.class
129129
model/Vec3.class
130130
sega/dreamcast/holly/Background.class

‎model/UntitledModel.java renamed to ‎model/CubeModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package model;
22

3-
public class UntitledModel {
3+
public class CubeModel {
44
public static Vec3[] position;
55
public static Vec3[] normal;
66
public static Vec2[] texture;
77
public static ModelObject[] objects;
8-
private UntitledModel() {
8+
private CubeModel() {
99
}
1010
static {
1111
position = new Vec3[8];

0 commit comments

Comments
 (0)