From de56ce5ac40cb8cece970159f2068c2bfdf9feb6 Mon Sep 17 00:00:00 2001 From: Zack Buhman Date: Sat, 28 Dec 2024 05:11:30 -0600 Subject: [PATCH] DreamcastVideo2: use TAGlobalParameter/TAVertexParameter --- Makefile.dreamcast.mk | 5 +- c/classpath.h | 92 +++++++------- c/classpath.inc.c | 92 +++++++------- c/main_dreamcast.c | 12 +- classpath.mk | 94 +++++++------- example/DreamcastVideo.class.h | 15 +++ {p => example}/DreamcastVideo.java | 2 +- example/DreamcastVideo2.class.h | 15 +++ {p => example}/DreamcastVideo2.java | 129 ++++---------------- generate_classpath.sh | 13 +- p/DreamcastVideo.class.h | 15 --- p/DreamcastVideo2.class.h | 15 --- p/Java23.java | 9 -- p/Test.java | 36 ------ p/end_of_list.class.h | 15 --- p/polygon_type_0.class.h | 15 --- p/vertex_polygon_type_0.class.h | 15 --- regs/sparse_struct_java.py | 2 +- sega/dreamcast/holly/TAGlobalParameter.java | 20 +-- sega/dreamcast/holly/TAVertexParameter.java | 36 +++--- 20 files changed, 236 insertions(+), 411 deletions(-) create mode 100644 example/DreamcastVideo.class.h rename {p => example}/DreamcastVideo.java (97%) create mode 100644 example/DreamcastVideo2.class.h rename {p => example}/DreamcastVideo2.java (59%) delete mode 100644 p/DreamcastVideo.class.h delete mode 100644 p/DreamcastVideo2.class.h delete mode 100644 p/Java23.java delete mode 100644 p/Test.java delete mode 100644 p/end_of_list.class.h delete mode 100644 p/polygon_type_0.class.h delete mode 100644 p/vertex_polygon_type_0.class.h diff --git a/Makefile.dreamcast.mk b/Makefile.dreamcast.mk index 49c677b..6978472 100644 --- a/Makefile.dreamcast.mk +++ b/Makefile.dreamcast.mk @@ -51,10 +51,7 @@ LIBGCC_OBJ = \ include classpath.mk CLASS_FILES = \ - p/polygon_type_0.class.o \ - p/vertex_polygon_type_0.class.o \ - p/end_of_list.class.o \ - p/DreamcastVideo2.class.o + example/DreamcastVideo2.class.o main.elf: LDSCRIPT = $(LIB)/main.lds main.elf: $(START_OBJ) $(OBJ) $(MAIN_OBJ) $(MAIN_DREAMCAST_OBJ) $(LIBGCC_OBJ) $(CLASS_FILES) $(CLASS_PATH) diff --git a/c/classpath.h b/c/classpath.h index 6692d79..3cc81e8 100644 --- a/c/classpath.h +++ b/c/classpath.h @@ -1,51 +1,51 @@ -#include "sega/dreamcast/systembus/SystembusBits.class.h" -#include "sega/dreamcast/systembus/Systembus.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_modifier_volume.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_sprite_type_1.class.h" -#include "sega/dreamcast/holly/CoreBits.class.h" -#include "sega/dreamcast/holly/TextureMemoryAllocation.class.h" -#include "sega/dreamcast/holly/TAVertexParameter.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_7.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_modifier_volume.class.h" -#include "sega/dreamcast/holly/Background.class.h" -#include "sega/dreamcast/holly/TAParameter.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_2.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_0.class.h" -#include "sega/dreamcast/holly/TABits.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_user_tile_clip.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_object_list_set.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_4.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_9.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_1.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_4.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter.class.h" -#include "sega/dreamcast/holly/ISPTSP.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_end_of_list.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_3.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_3.class.h" -#include "sega/dreamcast/holly/Core.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_14.class.h" -#include "sega/dreamcast/holly/Holly.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_5.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_1.class.h" -#include "sega/dreamcast/holly/RegionArray.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_6.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_10.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_0.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_sprite.class.h" -#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_2.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_13.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_11.class.h" -#include "sega/dreamcast/holly/TAFIFOPolygonConverter.class.h" -#include "sega/dreamcast/holly/RegionArray_OPBSize.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_12.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_8.class.h" -#include "sega/dreamcast/holly/TAVertexParameter_sprite_type_0.class.h" -#include "sega/dreamcast/MemoryMap.class.h" #include "java/io/PrintStream.class.h" -#include "java/lang/System.class.h" -#include "java/lang/String.class.h" #include "java/lang/Integer.class.h" #include "java/lang/Math.class.h" #include "java/lang/Object.class.h" +#include "java/lang/String.class.h" +#include "java/lang/System.class.h" #include "java/misc/Memory.class.h" +#include "sega/dreamcast/holly/Background.class.h" +#include "sega/dreamcast/holly/CoreBits.class.h" +#include "sega/dreamcast/holly/Core.class.h" +#include "sega/dreamcast/holly/Holly.class.h" +#include "sega/dreamcast/holly/ISPTSP.class.h" +#include "sega/dreamcast/holly/RegionArray.class.h" +#include "sega/dreamcast/holly/RegionArray_OPBSize.class.h" +#include "sega/dreamcast/holly/TABits.class.h" +#include "sega/dreamcast/holly/TAFIFOPolygonConverter.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_end_of_list.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_modifier_volume.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_object_list_set.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_0.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_1.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_2.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_3.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_polygon_type_4.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_sprite.class.h" +#include "sega/dreamcast/holly/TAGlobalParameter_user_tile_clip.class.h" +#include "sega/dreamcast/holly/TAParameter.class.h" +#include "sega/dreamcast/holly/TAVertexParameter.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_modifier_volume.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_0.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_10.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_11.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_12.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_13.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_14.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_1.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_2.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_3.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_4.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_5.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_6.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_7.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_8.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_polygon_type_9.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_sprite_type_0.class.h" +#include "sega/dreamcast/holly/TAVertexParameter_sprite_type_1.class.h" +#include "sega/dreamcast/holly/TextureMemoryAllocation.class.h" +#include "sega/dreamcast/MemoryMap.class.h" +#include "sega/dreamcast/systembus/SystembusBits.class.h" +#include "sega/dreamcast/systembus/Systembus.class.h" diff --git a/c/classpath.inc.c b/c/classpath.inc.c index eef6e3d..6d61743 100644 --- a/c/classpath.inc.c +++ b/c/classpath.inc.c @@ -1,51 +1,51 @@ -(const uint8_t *)&_binary_sega_dreamcast_systembus_SystembusBits_class_start, -(const uint8_t *)&_binary_sega_dreamcast_systembus_Systembus_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_modifier_volume_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_sprite_type_1_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_CoreBits_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TextureMemoryAllocation_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_7_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_modifier_volume_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_Background_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAParameter_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_2_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_0_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TABits_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_user_tile_clip_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_object_list_set_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_4_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_9_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_1_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_4_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_ISPTSP_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_end_of_list_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_3_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_3_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_Core_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_14_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_Holly_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_5_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_1_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_RegionArray_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_6_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_10_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_0_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_sprite_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_2_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_13_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_11_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAFIFOPolygonConverter_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_RegionArray_OPBSize_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_12_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_8_class_start, -(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_sprite_type_0_class_start, -(const uint8_t *)&_binary_sega_dreamcast_MemoryMap_class_start, (const uint8_t *)&_binary_java_io_PrintStream_class_start, -(const uint8_t *)&_binary_java_lang_System_class_start, -(const uint8_t *)&_binary_java_lang_String_class_start, (const uint8_t *)&_binary_java_lang_Integer_class_start, (const uint8_t *)&_binary_java_lang_Math_class_start, (const uint8_t *)&_binary_java_lang_Object_class_start, +(const uint8_t *)&_binary_java_lang_String_class_start, +(const uint8_t *)&_binary_java_lang_System_class_start, (const uint8_t *)&_binary_java_misc_Memory_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_Background_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_CoreBits_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_Core_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_Holly_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_ISPTSP_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_RegionArray_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_RegionArray_OPBSize_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TABits_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAFIFOPolygonConverter_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_end_of_list_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_modifier_volume_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_object_list_set_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_0_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_1_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_2_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_3_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_polygon_type_4_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_sprite_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAGlobalParameter_user_tile_clip_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAParameter_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_modifier_volume_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_0_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_10_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_11_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_12_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_13_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_14_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_1_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_2_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_3_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_4_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_5_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_6_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_7_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_8_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_polygon_type_9_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_sprite_type_0_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TAVertexParameter_sprite_type_1_class_start, +(const uint8_t *)&_binary_sega_dreamcast_holly_TextureMemoryAllocation_class_start, +(const uint8_t *)&_binary_sega_dreamcast_MemoryMap_class_start, +(const uint8_t *)&_binary_sega_dreamcast_systembus_SystembusBits_class_start, +(const uint8_t *)&_binary_sega_dreamcast_systembus_Systembus_class_start, diff --git a/c/main_dreamcast.c b/c/main_dreamcast.c index df25be0..7b5d43a 100644 --- a/c/main_dreamcast.c +++ b/c/main_dreamcast.c @@ -8,10 +8,7 @@ #include "sh7091_scif.h" #include "classpath.h" -#include "p/DreamcastVideo2.class.h" -#include "p/vertex_polygon_type_0.class.h" -#include "p/polygon_type_0.class.h" -#include "p/end_of_list.class.h" +#include "example/DreamcastVideo2.class.h" void main() { @@ -19,14 +16,11 @@ void main() const uint8_t * class_file_buffers[] = { #include "classpath.inc.c" - (const uint8_t *)&_binary_p_DreamcastVideo2_class_start, - (const uint8_t *)&_binary_p_vertex_polygon_type_0_class_start, - (const uint8_t *)&_binary_p_polygon_type_0_class_start, - (const uint8_t *)&_binary_p_end_of_list_class_start, + (const uint8_t *)&_binary_example_DreamcastVideo2_class_start, }; int class_file_buffers_length = (sizeof (class_file_buffers)) / (sizeof (class_file_buffers[0])); - const uint8_t * main_class = (const uint8_t *)"p/DreamcastVideo2"; + const uint8_t * main_class = (const uint8_t *)"example/DreamcastVideo2"; int main_class_length = string_length((const char *)main_class); int class_hash_table_length; diff --git a/classpath.mk b/classpath.mk index 8144869..bf09e1e 100644 --- a/classpath.mk +++ b/classpath.mk @@ -1,52 +1,52 @@ CLASS_PATH = \ - sega/dreamcast/systembus/SystembusBits.class.o \ - sega/dreamcast/systembus/Systembus.class.o \ - sega/dreamcast/holly/TAVertexParameter_modifier_volume.class.o \ - sega/dreamcast/holly/TAVertexParameter_sprite_type_1.class.o \ - sega/dreamcast/holly/CoreBits.class.o \ - sega/dreamcast/holly/TextureMemoryAllocation.class.o \ - sega/dreamcast/holly/TAVertexParameter.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_7.class.o \ - sega/dreamcast/holly/TAGlobalParameter_modifier_volume.class.o \ - sega/dreamcast/holly/Background.class.o \ - sega/dreamcast/holly/TAParameter.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_2.class.o \ - sega/dreamcast/holly/TAGlobalParameter_polygon_type_0.class.o \ - sega/dreamcast/holly/TABits.class.o \ - sega/dreamcast/holly/TAGlobalParameter_user_tile_clip.class.o \ - sega/dreamcast/holly/TAGlobalParameter_object_list_set.class.o \ - sega/dreamcast/holly/TAGlobalParameter_polygon_type_4.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_9.class.o \ - sega/dreamcast/holly/TAGlobalParameter_polygon_type_1.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_4.class.o \ - sega/dreamcast/holly/TAGlobalParameter.class.o \ - sega/dreamcast/holly/ISPTSP.class.o \ - sega/dreamcast/holly/TAGlobalParameter_end_of_list.class.o \ - sega/dreamcast/holly/TAGlobalParameter_polygon_type_3.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_3.class.o \ - sega/dreamcast/holly/Core.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_14.class.o \ - sega/dreamcast/holly/Holly.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_5.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_1.class.o \ - sega/dreamcast/holly/RegionArray.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_6.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_10.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_0.class.o \ - sega/dreamcast/holly/TAGlobalParameter_sprite.class.o \ - sega/dreamcast/holly/TAGlobalParameter_polygon_type_2.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_13.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_11.class.o \ - sega/dreamcast/holly/TAFIFOPolygonConverter.class.o \ - sega/dreamcast/holly/RegionArray_OPBSize.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_12.class.o \ - sega/dreamcast/holly/TAVertexParameter_polygon_type_8.class.o \ - sega/dreamcast/holly/TAVertexParameter_sprite_type_0.class.o \ - sega/dreamcast/MemoryMap.class.o \ java/io/PrintStream.class.o \ - java/lang/System.class.o \ - java/lang/String.class.o \ java/lang/Integer.class.o \ java/lang/Math.class.o \ java/lang/Object.class.o \ - java/misc/Memory.class.o + java/lang/String.class.o \ + java/lang/System.class.o \ + java/misc/Memory.class.o \ + sega/dreamcast/holly/Background.class.o \ + sega/dreamcast/holly/CoreBits.class.o \ + sega/dreamcast/holly/Core.class.o \ + sega/dreamcast/holly/Holly.class.o \ + sega/dreamcast/holly/ISPTSP.class.o \ + sega/dreamcast/holly/RegionArray.class.o \ + sega/dreamcast/holly/RegionArray_OPBSize.class.o \ + sega/dreamcast/holly/TABits.class.o \ + sega/dreamcast/holly/TAFIFOPolygonConverter.class.o \ + sega/dreamcast/holly/TAGlobalParameter.class.o \ + sega/dreamcast/holly/TAGlobalParameter_end_of_list.class.o \ + sega/dreamcast/holly/TAGlobalParameter_modifier_volume.class.o \ + sega/dreamcast/holly/TAGlobalParameter_object_list_set.class.o \ + sega/dreamcast/holly/TAGlobalParameter_polygon_type_0.class.o \ + sega/dreamcast/holly/TAGlobalParameter_polygon_type_1.class.o \ + sega/dreamcast/holly/TAGlobalParameter_polygon_type_2.class.o \ + sega/dreamcast/holly/TAGlobalParameter_polygon_type_3.class.o \ + sega/dreamcast/holly/TAGlobalParameter_polygon_type_4.class.o \ + sega/dreamcast/holly/TAGlobalParameter_sprite.class.o \ + sega/dreamcast/holly/TAGlobalParameter_user_tile_clip.class.o \ + sega/dreamcast/holly/TAParameter.class.o \ + sega/dreamcast/holly/TAVertexParameter.class.o \ + sega/dreamcast/holly/TAVertexParameter_modifier_volume.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_0.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_10.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_11.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_12.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_13.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_14.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_1.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_2.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_3.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_4.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_5.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_6.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_7.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_8.class.o \ + sega/dreamcast/holly/TAVertexParameter_polygon_type_9.class.o \ + sega/dreamcast/holly/TAVertexParameter_sprite_type_0.class.o \ + sega/dreamcast/holly/TAVertexParameter_sprite_type_1.class.o \ + sega/dreamcast/holly/TextureMemoryAllocation.class.o \ + sega/dreamcast/MemoryMap.class.o \ + sega/dreamcast/systembus/SystembusBits.class.o \ + sega/dreamcast/systembus/Systembus.class.o diff --git a/example/DreamcastVideo.class.h b/example/DreamcastVideo.class.h new file mode 100644 index 0000000..2115128 --- /dev/null +++ b/example/DreamcastVideo.class.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_example_DreamcastVideo_class_start __asm("_binary_example_DreamcastVideo_class_start"); +extern uint32_t _binary_example_DreamcastVideo_class_end __asm("_binary_example_DreamcastVideo_class_end"); +extern uint32_t _binary_example_DreamcastVideo_class_size __asm("_binary_example_DreamcastVideo_class_size"); + +#ifdef __cplusplus +} +#endif diff --git a/p/DreamcastVideo.java b/example/DreamcastVideo.java similarity index 97% rename from p/DreamcastVideo.java rename to example/DreamcastVideo.java index 7a52e4d..03e4918 100644 --- a/p/DreamcastVideo.java +++ b/example/DreamcastVideo.java @@ -1,4 +1,4 @@ -package p; +package example; import sega.dreamcast.holly.Holly; import java.misc.Memory; diff --git a/example/DreamcastVideo2.class.h b/example/DreamcastVideo2.class.h new file mode 100644 index 0000000..33a8306 --- /dev/null +++ b/example/DreamcastVideo2.class.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_example_DreamcastVideo2_class_start __asm("_binary_example_DreamcastVideo2_class_start"); +extern uint32_t _binary_example_DreamcastVideo2_class_end __asm("_binary_example_DreamcastVideo2_class_end"); +extern uint32_t _binary_example_DreamcastVideo2_class_size __asm("_binary_example_DreamcastVideo2_class_size"); + +#ifdef __cplusplus +} +#endif diff --git a/p/DreamcastVideo2.java b/example/DreamcastVideo2.java similarity index 59% rename from p/DreamcastVideo2.java rename to example/DreamcastVideo2.java index 77fb479..57f0a22 100644 --- a/p/DreamcastVideo2.java +++ b/example/DreamcastVideo2.java @@ -1,4 +1,4 @@ -package p; +package example; import sega.dreamcast.holly.Background; import sega.dreamcast.holly.Core; @@ -10,91 +10,17 @@ import sega.dreamcast.holly.TAFIFOPolygonConverter; import sega.dreamcast.holly.TAParameter; import sega.dreamcast.holly.TextureMemoryAllocation; import sega.dreamcast.holly.ISPTSP; +import sega.dreamcast.holly.TAVertexParameter; +import sega.dreamcast.holly.TAGlobalParameter; import sega.dreamcast.systembus.Systembus; import sega.dreamcast.systembus.SystembusBits; import sega.dreamcast.MemoryMap; import java.misc.Memory; -class end_of_list { - public int parameter_control_word; - public int _res0; - public int _res1; - public int _res2; - public int _res3; - public int _res4; - public int _res5; - public int _res6; - public end_of_list(int parameter_control_word - ) { - this.parameter_control_word = parameter_control_word; - this._res0 = 0; - this._res1 = 0; - this._res2 = 0; - this._res3 = 0; - this._res4 = 0; - this._res5 = 0; - this._res6 = 0; - } -} - -class polygon_type_0 { - public int parameter_control_word; - public int isp_tsp_instruction_word; - public int tsp_instruction_word; - public int texture_control_word; - public int _res0; - public int _res1; - public int data_size_for_sort_dma; - public int next_address_for_sort_dma; - public polygon_type_0(int parameter_control_word, - int isp_tsp_instruction_word, - int tsp_instruction_word, - int texture_control_word, - int data_size_for_sort_dma, - int next_address_for_sort_dma - ) { - this.parameter_control_word = parameter_control_word; - this.isp_tsp_instruction_word = isp_tsp_instruction_word; - this.tsp_instruction_word = tsp_instruction_word; - this.texture_control_word = texture_control_word; - this._res0 = 0; - this._res1 = 0; - this.data_size_for_sort_dma = data_size_for_sort_dma; - this.next_address_for_sort_dma = next_address_for_sort_dma; - } -} - -class vertex_polygon_type_0 { - public int parameter_control_word; - public float x; - public float y; - public float z; - public int _res0; - public int _res1; - public int base_color; - public int _res2; - public vertex_polygon_type_0(int parameter_control_word, - float x, - float y, - float z, - int base_color - ) { - this.parameter_control_word = parameter_control_word; - this.x = x; - this.y = y; - this.z = z; - this._res0 = 0; - this._res1 = 0; - this.base_color = base_color; - this._res2 = 0; - } -} - - class DreamcastVideo2 { - public static polygon_type_0 pt0; - public static vertex_polygon_type_0 vt0; - public static end_of_list eol; + public static TAGlobalParameter.polygon_type_0 gt0; + public static TAVertexParameter.polygon_type_0 vt0; + public static TAGlobalParameter.end_of_list eol; static { int parameter_control_word = TAParameter.para_control__para_type__polygon_or_modifier_volume @@ -112,47 +38,44 @@ class DreamcastVideo2 { int data_size_for_sort_dma = 0; int next_address_for_sort_dma = 0; - pt0 = new polygon_type_0(parameter_control_word, - isp_tsp_instruction_word, - tsp_instruction_word, - texture_control_word, - data_size_for_sort_dma, - next_address_for_sort_dma); + gt0 = new TAGlobalParameter.polygon_type_0(parameter_control_word, + isp_tsp_instruction_word, + tsp_instruction_word, + texture_control_word, + data_size_for_sort_dma, + next_address_for_sort_dma); - vt0 = new vertex_polygon_type_0(0, // parameter_control_word - 0, // x - 0, // y - 0.1f, // z - 0xff00ff00); // color (green) + vt0 = new TAVertexParameter.polygon_type_0(0, // parameter_control_word + 0.0f, // x + 0.0f, // y + 0.1f, // z + 0xff00ff00); // color (green) - eol = new end_of_list(TAParameter.para_control__para_type__end_of_list); + eol = new TAGlobalParameter.end_of_list(TAParameter.para_control__para_type__end_of_list); } - public static int polygon_vertex_parameter_control_word(boolean end_of_strip) - { - return TAParameter.para_control__para_type__vertex_parameter - | (end_of_strip ? TAParameter.para_control__end_of_strip : 0); - } - - public static void transfer_scene() { - Memory.putSQ1(DreamcastVideo2.pt0, MemoryMap.ta_fifo_polygon_converter); + // global parameter + Memory.putSQ1(DreamcastVideo2.gt0, MemoryMap.ta_fifo_polygon_converter); - DreamcastVideo2.vt0.parameter_control_word = polygon_vertex_parameter_control_word(false); + // vertex parameters + DreamcastVideo2.vt0.parameter_control_word = TAParameter.para_control__para_type__vertex_parameter; DreamcastVideo2.vt0.x = 10.0f; DreamcastVideo2.vt0.y = 10.0f; Memory.putSQ1(DreamcastVideo2.vt0, MemoryMap.ta_fifo_polygon_converter); - DreamcastVideo2.vt0.parameter_control_word = polygon_vertex_parameter_control_word(false); + DreamcastVideo2.vt0.parameter_control_word = TAParameter.para_control__para_type__vertex_parameter; DreamcastVideo2.vt0.x = 100.0f; DreamcastVideo2.vt0.y = 10.0f; Memory.putSQ1(DreamcastVideo2.vt0, MemoryMap.ta_fifo_polygon_converter); - DreamcastVideo2.vt0.parameter_control_word = polygon_vertex_parameter_control_word(true); + DreamcastVideo2.vt0.parameter_control_word = TAParameter.para_control__para_type__vertex_parameter + | TAParameter.para_control__end_of_strip; DreamcastVideo2.vt0.x = 100.0f; DreamcastVideo2.vt0.y = 100.0f; Memory.putSQ1(DreamcastVideo2.vt0, MemoryMap.ta_fifo_polygon_converter); + // end of list Memory.putSQ1(DreamcastVideo2.eol, MemoryMap.ta_fifo_polygon_converter); } diff --git a/generate_classpath.sh b/generate_classpath.sh index 2a59717..b8ceb64 100644 --- a/generate_classpath.sh +++ b/generate_classpath.sh @@ -66,9 +66,10 @@ function classpath_h () { done } -find sega/ java/ -name '*.java' | make_class -find sega/ java/ -name '*.class' | rename_class_files -find sega/ java/ -name '*.class' | classpath_mk -find sega/ java/ -name '*.class' | classpath_inc_c -find sega/ java/ -name '*.class' | make_header -find sega/ java/ -name '*.class' | classpath_h +find sega/ java/ -name '*.class' -exec rm -f {} \; +find example/ sega/ java/ -name '*.java' | sort | make_class +find sega/ java/ -name '*.class' | sort | rename_class_files +find sega/ java/ -name '*.class' | sort | classpath_mk +find sega/ java/ -name '*.class' | sort | classpath_inc_c +find sega/ java/ -name '*.class' | sort | make_header +find sega/ java/ -name '*.class' | sort | classpath_h diff --git a/p/DreamcastVideo.class.h b/p/DreamcastVideo.class.h deleted file mode 100644 index 729dcb8..0000000 --- a/p/DreamcastVideo.class.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern uint32_t _binary_p_DreamcastVideo_class_start __asm("_binary_p_DreamcastVideo_class_start"); -extern uint32_t _binary_p_DreamcastVideo_class_end __asm("_binary_p_DreamcastVideo_class_end"); -extern uint32_t _binary_p_DreamcastVideo_class_size __asm("_binary_p_DreamcastVideo_class_size"); - -#ifdef __cplusplus -} -#endif diff --git a/p/DreamcastVideo2.class.h b/p/DreamcastVideo2.class.h deleted file mode 100644 index f638876..0000000 --- a/p/DreamcastVideo2.class.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern C { -#endif - -extern uint32_t _binary_p_DreamcastVideo2_class_start __asm("_binary_p_DreamcastVideo2_class_start"); -extern uint32_t _binary_p_DreamcastVideo2_class_end __asm("_binary_p_DreamcastVideo2_class_end"); -extern uint32_t _binary_p_DreamcastVideo2_class_size __asm("_binary_p_DreamcastVideo2_class_size"); - -#ifdef __cplusplus -} -#endif diff --git a/p/Java23.java b/p/Java23.java deleted file mode 100644 index bb96899..0000000 --- a/p/Java23.java +++ /dev/null @@ -1,9 +0,0 @@ -package p; - -class Java23 { - -void main() { - java.io.IO.println("Hello world!"); -} - -} diff --git a/p/Test.java b/p/Test.java deleted file mode 100644 index a090da4..0000000 --- a/p/Test.java +++ /dev/null @@ -1,36 +0,0 @@ -package p; - -import java.util.ArrayList; - -public class Test { - public int foo(int a) { - return a * 2; - } - - public final String test = "asdf"; - public final int eggs = 1234; - public final float bacon = 12.34f; - - public int bar = foo(eggs); - - public static float mul(float a, float b) { - return a * b; - } - - public static int comp(int a, int b) { - if (a < b) { - return a * 2; - } else { - return a * 4; - } - } - - public static void main(String[] args) { - ArrayList numbers = new ArrayList(); - numbers.add(5); - numbers.add(9); - numbers.add(8); - numbers.add(1); - numbers.forEach( (n) -> { System.out.println(n); } ); - } -} diff --git a/p/end_of_list.class.h b/p/end_of_list.class.h deleted file mode 100644 index 964e356..0000000 --- a/p/end_of_list.class.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern C { -#endif - -extern uint32_t _binary_p_end_of_list_class_start __asm("_binary_p_end_of_list_class_start"); -extern uint32_t _binary_p_end_of_list_class_end __asm("_binary_p_end_of_list_class_end"); -extern uint32_t _binary_p_end_of_list_class_size __asm("_binary_p_end_of_list_class_size"); - -#ifdef __cplusplus -} -#endif diff --git a/p/polygon_type_0.class.h b/p/polygon_type_0.class.h deleted file mode 100644 index be71425..0000000 --- a/p/polygon_type_0.class.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern C { -#endif - -extern uint32_t _binary_p_polygon_type_0_class_start __asm("_binary_p_polygon_type_0_class_start"); -extern uint32_t _binary_p_polygon_type_0_class_end __asm("_binary_p_polygon_type_0_class_end"); -extern uint32_t _binary_p_polygon_type_0_class_size __asm("_binary_p_polygon_type_0_class_size"); - -#ifdef __cplusplus -} -#endif diff --git a/p/vertex_polygon_type_0.class.h b/p/vertex_polygon_type_0.class.h deleted file mode 100644 index b46232d..0000000 --- a/p/vertex_polygon_type_0.class.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern C { -#endif - -extern uint32_t _binary_p_vertex_polygon_type_0_class_start __asm("_binary_p_vertex_polygon_type_0_class_start"); -extern uint32_t _binary_p_vertex_polygon_type_0_class_end __asm("_binary_p_vertex_polygon_type_0_class_end"); -extern uint32_t _binary_p_vertex_polygon_type_0_class_size __asm("_binary_p_vertex_polygon_type_0_class_size"); - -#ifdef __cplusplus -} -#endif diff --git a/regs/sparse_struct_java.py b/regs/sparse_struct_java.py index a40a987..a8c1219 100644 --- a/regs/sparse_struct_java.py +++ b/regs/sparse_struct_java.py @@ -40,7 +40,7 @@ def render_constructor(get_type, declaration): if f.array_length > 1] def render_declaration(get_type, declaration): - yield f"public class {declaration.name} {{" + yield f"public static class {declaration.name} {{" yield from render_fields(get_type, declaration.fields) yield from render_constructor(get_type, declaration) yield "}" diff --git a/sega/dreamcast/holly/TAGlobalParameter.java b/sega/dreamcast/holly/TAGlobalParameter.java index 8fdc593..201a124 100644 --- a/sega/dreamcast/holly/TAGlobalParameter.java +++ b/sega/dreamcast/holly/TAGlobalParameter.java @@ -2,7 +2,7 @@ package sega.dreamcast.holly; public class TAGlobalParameter { - public class end_of_list { + public static class end_of_list { public int parameter_control_word; public int _res0; public int _res1; @@ -23,7 +23,7 @@ public class TAGlobalParameter { this._res6 = 0; } } - public class user_tile_clip { + public static class user_tile_clip { public int parameter_control_word; public int _res0; public int _res1; @@ -48,7 +48,7 @@ public class TAGlobalParameter { this.user_clip_y_max = user_clip_y_max; } } - public class object_list_set { + public static class object_list_set { public int parameter_control_word; public int object_pointer; public int _res0; @@ -74,7 +74,7 @@ public class TAGlobalParameter { this.bounding_box_y_max = bounding_box_y_max; } } - public class polygon_type_0 { + public static class polygon_type_0 { public int parameter_control_word; public int isp_tsp_instruction_word; public int tsp_instruction_word; @@ -100,7 +100,7 @@ public class TAGlobalParameter { this.next_address_for_sort_dma = next_address_for_sort_dma; } } - public class polygon_type_1 { + public static class polygon_type_1 { public int parameter_control_word; public int isp_tsp_instruction_word; public int tsp_instruction_word; @@ -128,7 +128,7 @@ public class TAGlobalParameter { this.face_color_b = face_color_b; } } - public class polygon_type_2 { + public static class polygon_type_2 { public int parameter_control_word; public int isp_tsp_instruction_word; public int tsp_instruction_word; @@ -178,7 +178,7 @@ public class TAGlobalParameter { this.face_offset_color_b = face_offset_color_b; } } - public class polygon_type_3 { + public static class polygon_type_3 { public int parameter_control_word; public int isp_tsp_instruction_word; public int tsp_instruction_word_0; @@ -206,7 +206,7 @@ public class TAGlobalParameter { this.next_address_for_sort_dma = next_address_for_sort_dma; } } - public class polygon_type_4 { + public static class polygon_type_4 { public int parameter_control_word; public int isp_tsp_instruction_word; public int tsp_instruction_word_0; @@ -258,7 +258,7 @@ public class TAGlobalParameter { this.face_color_b_1 = face_color_b_1; } } - public class sprite { + public static class sprite { public int parameter_control_word; public int isp_tsp_instruction_word; public int tsp_instruction_word; @@ -286,7 +286,7 @@ public class TAGlobalParameter { this.next_address_for_sort_dma = next_address_for_sort_dma; } } - public class modifier_volume { + public static class modifier_volume { public int parameter_control_word; public int isp_tsp_instruction_word; public int _res0; diff --git a/sega/dreamcast/holly/TAVertexParameter.java b/sega/dreamcast/holly/TAVertexParameter.java index 03e7824..7f0f4d2 100644 --- a/sega/dreamcast/holly/TAVertexParameter.java +++ b/sega/dreamcast/holly/TAVertexParameter.java @@ -2,7 +2,7 @@ package sega.dreamcast.holly; public class TAVertexParameter { - public class polygon_type_0 { + public static class polygon_type_0 { public int parameter_control_word; public float x; public float y; @@ -27,7 +27,7 @@ public class TAVertexParameter { this._res2 = 0; } } - public class polygon_type_1 { + public static class polygon_type_1 { public int parameter_control_word; public float x; public float y; @@ -55,7 +55,7 @@ public class TAVertexParameter { this.base_color_b = base_color_b; } } - public class polygon_type_2 { + public static class polygon_type_2 { public int parameter_control_word; public float x; public float y; @@ -80,7 +80,7 @@ public class TAVertexParameter { this._res2 = 0; } } - public class polygon_type_3 { + public static class polygon_type_3 { public int parameter_control_word; public float x; public float y; @@ -108,7 +108,7 @@ public class TAVertexParameter { this.offset_color = offset_color; } } - public class polygon_type_4 { + public static class polygon_type_4 { public int parameter_control_word; public float x; public float y; @@ -135,7 +135,7 @@ public class TAVertexParameter { this.offset_color = offset_color; } } - public class polygon_type_5 { + public static class polygon_type_5 { public int parameter_control_word; public float x; public float y; @@ -185,7 +185,7 @@ public class TAVertexParameter { this.offset_color_b = offset_color_b; } } - public class polygon_type_6 { + public static class polygon_type_6 { public int parameter_control_word; public float x; public float y; @@ -234,7 +234,7 @@ public class TAVertexParameter { this.offset_color_b = offset_color_b; } } - public class polygon_type_7 { + public static class polygon_type_7 { public int parameter_control_word; public float x; public float y; @@ -262,7 +262,7 @@ public class TAVertexParameter { this.offset_intensity = offset_intensity; } } - public class polygon_type_8 { + public static class polygon_type_8 { public int parameter_control_word; public float x; public float y; @@ -289,7 +289,7 @@ public class TAVertexParameter { this.offset_intensity = offset_intensity; } } - public class polygon_type_9 { + public static class polygon_type_9 { public int parameter_control_word; public float x; public float y; @@ -315,7 +315,7 @@ public class TAVertexParameter { this._res1 = 0; } } - public class polygon_type_10 { + public static class polygon_type_10 { public int parameter_control_word; public float x; public float y; @@ -341,7 +341,7 @@ public class TAVertexParameter { this._res1 = 0; } } - public class polygon_type_11 { + public static class polygon_type_11 { public int parameter_control_word; public float x; public float y; @@ -389,7 +389,7 @@ public class TAVertexParameter { this._res3 = 0; } } - public class polygon_type_12 { + public static class polygon_type_12 { public int parameter_control_word; public float x; public float y; @@ -435,7 +435,7 @@ public class TAVertexParameter { this._res5 = 0; } } - public class polygon_type_13 { + public static class polygon_type_13 { public int parameter_control_word; public float x; public float y; @@ -483,7 +483,7 @@ public class TAVertexParameter { this._res3 = 0; } } - public class polygon_type_14 { + public static class polygon_type_14 { public int parameter_control_word; public float x; public float y; @@ -529,7 +529,7 @@ public class TAVertexParameter { this._res5 = 0; } } - public class sprite_type_0 { + public static class sprite_type_0 { public int parameter_control_word; public float a_x; public float a_y; @@ -577,7 +577,7 @@ public class TAVertexParameter { this._res3 = 0; } } - public class sprite_type_1 { + public static class sprite_type_1 { public int parameter_control_word; public float a_x; public float a_y; @@ -628,7 +628,7 @@ public class TAVertexParameter { this.c_u_c_v = c_u_c_v; } } - public class modifier_volume { + public static class modifier_volume { public int parameter_control_word; public float a_x; public float a_y;