From 16db74a16a1248168fd28b10194e0cb77d113a27 Mon Sep 17 00:00:00 2001 From: Zack Buhman Date: Fri, 3 Jan 2025 10:19:50 -0600 Subject: [PATCH] rename UntitledModel to CubeModel --- Makefile.dreamcast.mk | 4 +-- cube.obj | 38 ++++++++++++++++++++ example/JavaCube.java | 6 ++-- generate.sh | 4 +-- generate_classpath.sh | 2 +- model/{UntitledModel.java => CubeModel.java} | 4 +-- 6 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 cube.obj rename model/{UntitledModel.java => CubeModel.java} (98%) diff --git a/Makefile.dreamcast.mk b/Makefile.dreamcast.mk index a3b3de7..7e2964c 100644 --- a/Makefile.dreamcast.mk +++ b/Makefile.dreamcast.mk @@ -82,7 +82,7 @@ jvm.iso: boot.bin main.bin zero.bin /=$(LIB)/ABSTRACT.TXT \ /=$(LIB)/BIBLIOGR.TXT \ example/GdromDirectoryRecordHandler.class \ - example/GdromTest.class \ + example/GdromClassLoader.class \ filesystem/iso9660/ByteParser.class \ filesystem/iso9660/DirectoryRecord.class \ filesystem/iso9660/ExtentReader.class \ @@ -111,7 +111,7 @@ jvm.iso: boot.bin main.bin zero.bin example/JavaCubeDirectoryRecordHandler.class \ model/FacePTN.class \ model/ModelObject.class \ - model/UntitledModel.class \ + model/CubeModel.class \ model/Vec2.class \ model/Vec3.class \ sega/dreamcast/holly/Background.class \ diff --git a/cube.obj b/cube.obj new file mode 100644 index 0000000..6dd0bb0 --- /dev/null +++ b/cube.obj @@ -0,0 +1,38 @@ +# Blender 4.1.1 +# www.blender.org +mtllib cube.mtl +o Cube +v 1.000000 1.000000 -1.000000 +v 1.000000 -1.000000 -1.000000 +v 1.000000 1.000000 1.000000 +v 1.000000 -1.000000 1.000000 +v -1.000000 1.000000 -1.000000 +v -1.000000 -1.000000 -1.000000 +v -1.000000 1.000000 1.000000 +v -1.000000 -1.000000 1.000000 +vn -0.0000 1.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -1.0000 -0.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vt 1.000000 0.000000 +vt 0.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.500000 +vt 0.000000 1.000000 +vt 1.000000 1.000000 +s 0 +usemtl Material +f 5/1/1 3/2/1 1/3/1 +f 3/1/2 8/2/2 4/3/2 +f 7/4/3 6/5/3 8/2/3 +f 2/1/4 8/2/4 6/3/4 +f 1/4/5 4/5/5 2/2/5 +f 5/1/6 2/2/6 6/3/6 +f 5/1/1 7/4/1 3/2/1 +f 3/1/2 7/4/2 8/2/2 +f 7/4/3 5/6/3 6/5/3 +f 2/1/4 4/4/4 8/2/4 +f 1/4/5 3/6/5 4/5/5 +f 5/1/6 1/4/6 2/2/6 diff --git a/example/JavaCube.java b/example/JavaCube.java index 77acd3d..6fb01ec 100644 --- a/example/JavaCube.java +++ b/example/JavaCube.java @@ -15,7 +15,7 @@ import sega.dreamcast.holly.TAGlobalParameter; import sega.dreamcast.holly.VideoOutput; import sega.dreamcast.holly.VideoOutputMode; import sega.dreamcast.MemoryMap; -import model.UntitledModel; +import model.CubeModel; import model.Vec3; import model.Vec2; import model.FacePTN; @@ -286,9 +286,9 @@ public class JavaCube { Memory.putSQ1(gt0[0], MemoryMap.ta_fifo_polygon_converter); // triangle parameters - ModelObject obj = UntitledModel.objects[0]; + ModelObject obj = CubeModel.objects[0]; for (int i = 0; i < obj.faces.length; i ++) { - transform_triangle(i, UntitledModel.position, UntitledModel.texture, obj.faces[i]); + transform_triangle(i, CubeModel.position, CubeModel.texture, obj.faces[i]); } // end of list diff --git a/generate.sh b/generate.sh index 4534d6e..a78de2f 100644 --- a/generate.sh +++ b/generate.sh @@ -13,14 +13,14 @@ python regs/bits_gen.py ../dreamcast/regs/core_bits.csv holly CoreBits > python regs/bits_gen.py ../dreamcast/regs/ta_bits.csv holly TABits > sega/dreamcast/holly/TABits.java python regs/bits_gen.py ../dreamcast/regs/isp_tsp.csv holly ISPTSP > sega/dreamcast/holly/ISPTSP.java python regs/bits_gen.py ../dreamcast/regs/ta_parameter.csv holly TAParameter > sega/dreamcast/holly/TAParameter.java -python regs/bits_gen.py ..//dreamcast/regs/gdrom_bits.csv gdrom GdromBits > sega/dreamcast/gdrom/GdromBits.java +python regs/bits_gen.py ../dreamcast/regs/gdrom_bits.csv gdrom GdromBits > sega/dreamcast/gdrom/GdromBits.java python regs/bits_gen.py ../dreamcast/regs/systembus_bits.csv systembus SystembusBits > sega/dreamcast/systembus/SystembusBits.java python regs/ta_parameters.py ../dreamcast/regs/vertex_parameter_format.csv holly TAVertexParameter > sega/dreamcast/holly/TAVertexParameter.java python regs/ta_parameters.py ../dreamcast/regs/global_parameter_format.csv holly TAGlobalParameter > sega/dreamcast/holly/TAGlobalParameter.java -PYTHONPATH=./regs/ python ../model_generator/generate_java.py ../untitled.obj UntitledModel > ./model/UntitledModel.java +PYTHONPATH=./regs/ python ../model_generator/generate_java.py cube.obj CubeModel > ./model/CubeModel.java python images/color_convert.py images/java_cup.png argb4444 images/java_cup.data python images/color_convert.py images/java_text.png argb4444 images/java_text.data diff --git a/generate_classpath.sh b/generate_classpath.sh index b86923c..4d87169 100644 --- a/generate_classpath.sh +++ b/generate_classpath.sh @@ -124,7 +124,7 @@ declare -a application_classes=( example/JavaCube.class model/FacePTN.class model/ModelObject.class - model/UntitledModel.class + model/CubeModel.class model/Vec2.class model/Vec3.class sega/dreamcast/holly/Background.class diff --git a/model/UntitledModel.java b/model/CubeModel.java similarity index 98% rename from model/UntitledModel.java rename to model/CubeModel.java index df6c00b..f1bd061 100644 --- a/model/UntitledModel.java +++ b/model/CubeModel.java @@ -1,11 +1,11 @@ package model; -public class UntitledModel { +public class CubeModel { public static Vec3[] position; public static Vec3[] normal; public static Vec2[] texture; public static ModelObject[] objects; - private UntitledModel() { + private CubeModel() { } static { position = new Vec3[8];