diff --git a/base.mk b/base.mk index 411afb4..8f30382 100644 --- a/base.mk +++ b/base.mk @@ -39,7 +39,7 @@ endef makefile_path := $(dir $(abspath $(firstword $(MAKEFILE_LIST)))) makefile_relative = $(shell realpath --relative-to $(makefile_path) $(1)) -as_obj_binary = _binary_$(subst .,_,$(subst /,_,$(subst .h,,$(call makefile_relative,$(1))))) +as_obj_binary = _binary_$(subst -,_,$(subst .,_,$(subst /,_,$(subst .h,,$(call makefile_relative,$(1)))))) define BUILD_BINARY_H @echo gen $(call makefile_relative,$@) diff --git a/bsp/20kdm2/textures/sfx/flame1.jpg b/bsp/20kdm2/textures/sfx/flame1.jpg deleted file mode 100644 index 892bab7..0000000 Binary files a/bsp/20kdm2/textures/sfx/flame1.jpg and /dev/null differ diff --git a/bsp/baseq3/models/mapobjects/skel/skel.data b/bsp/baseq3/models/mapobjects/skel/skel.data new file mode 100644 index 0000000..89e4682 Binary files /dev/null and b/bsp/baseq3/models/mapobjects/skel/skel.data differ diff --git a/bsp/baseq3/models/mapobjects/skel/skel.data.h b/bsp/baseq3/models/mapobjects/skel/skel.data.h new file mode 100644 index 0000000..a11dbb0 --- /dev/null +++ b/bsp/baseq3/models/mapobjects/skel/skel.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_models_mapobjects_skel_skel_data_start __asm("_binary_bsp_baseq3_models_mapobjects_skel_skel_data_start"); +extern uint32_t _binary_bsp_baseq3_models_mapobjects_skel_skel_data_end __asm("_binary_bsp_baseq3_models_mapobjects_skel_skel_data_end"); +extern uint32_t _binary_bsp_baseq3_models_mapobjects_skel_skel_data_size __asm("_binary_bsp_baseq3_models_mapobjects_skel_skel_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/models/mapobjects/skel/skel.tga b/bsp/baseq3/models/mapobjects/skel/skel.tga new file mode 100644 index 0000000..b4e7f31 Binary files /dev/null and b/bsp/baseq3/models/mapobjects/skel/skel.tga differ diff --git a/bsp/baseq3/textures/gothic_block/blocks18b.data b/bsp/baseq3/textures/gothic_block/blocks18b.data new file mode 100644 index 0000000..613838a Binary files /dev/null and b/bsp/baseq3/textures/gothic_block/blocks18b.data differ diff --git a/bsp/baseq3/textures/gothic_block/blocks18b.data.h b/bsp/baseq3/textures/gothic_block/blocks18b.data.h new file mode 100644 index 0000000..b992362 --- /dev/null +++ b/bsp/baseq3/textures/gothic_block/blocks18b.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_block_blocks18b_data_start __asm("_binary_bsp_baseq3_textures_gothic_block_blocks18b_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_block_blocks18b_data_end __asm("_binary_bsp_baseq3_textures_gothic_block_blocks18b_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_block_blocks18b_data_size __asm("_binary_bsp_baseq3_textures_gothic_block_blocks18b_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_block/blocks18b.jpg b/bsp/baseq3/textures/gothic_block/blocks18b.jpg new file mode 100644 index 0000000..b957a8e Binary files /dev/null and b/bsp/baseq3/textures/gothic_block/blocks18b.jpg differ diff --git a/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data b/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data new file mode 100644 index 0000000..13c6920 Binary files /dev/null and b/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data differ diff --git a/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data.h b/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data.h new file mode 100644 index 0000000..bce4cfd --- /dev/null +++ b/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_start __asm("_binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_end __asm("_binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_size __asm("_binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.jpg b/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.jpg new file mode 100644 index 0000000..80bce00 Binary files /dev/null and b/bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.jpg differ diff --git a/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data b/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data new file mode 100644 index 0000000..eb617a7 Binary files /dev/null and b/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data differ diff --git a/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data.h b/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data.h new file mode 100644 index 0000000..0da3ba4 --- /dev/null +++ b/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_start __asm("_binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_end __asm("_binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_size __asm("_binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.jpg b/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.jpg new file mode 100644 index 0000000..eecf508 Binary files /dev/null and b/bsp/baseq3/textures/gothic_floor/largerblock3b3x128.jpg differ diff --git a/bsp/baseq3/textures/gothic_trim/border2.data b/bsp/baseq3/textures/gothic_trim/border2.data new file mode 100644 index 0000000..6f073dc Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/border2.data differ diff --git a/bsp/baseq3/textures/gothic_trim/border2.data.h b/bsp/baseq3/textures/gothic_trim/border2.data.h new file mode 100644 index 0000000..3a92208 --- /dev/null +++ b/bsp/baseq3/textures/gothic_trim/border2.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_border2_data_start __asm("_binary_bsp_baseq3_textures_gothic_trim_border2_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_border2_data_end __asm("_binary_bsp_baseq3_textures_gothic_trim_border2_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_border2_data_size __asm("_binary_bsp_baseq3_textures_gothic_trim_border2_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_trim/border2.jpg b/bsp/baseq3/textures/gothic_trim/border2.jpg new file mode 100644 index 0000000..d69e6a1 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/border2.jpg differ diff --git a/bsp/baseq3/textures/gothic_trim/km_arena1tower4.data b/bsp/baseq3/textures/gothic_trim/km_arena1tower4.data new file mode 100644 index 0000000..770b378 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/km_arena1tower4.data differ diff --git a/bsp/baseq3/textures/gothic_trim/km_arena1tower4.data.h b/bsp/baseq3/textures/gothic_trim/km_arena1tower4.data.h new file mode 100644 index 0000000..a3ae369 --- /dev/null +++ b/bsp/baseq3/textures/gothic_trim/km_arena1tower4.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_start __asm("_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_end __asm("_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_size __asm("_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_trim/km_arena1tower4.jpg b/bsp/baseq3/textures/gothic_trim/km_arena1tower4.jpg new file mode 100644 index 0000000..37e536a Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/km_arena1tower4.jpg differ diff --git a/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data b/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data new file mode 100644 index 0000000..78b821b Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data differ diff --git a/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data.h b/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data.h new file mode 100644 index 0000000..0ebe3b8 --- /dev/null +++ b/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_start __asm("_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_end __asm("_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_size __asm("_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.jpg b/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.jpg new file mode 100644 index 0000000..ecd6f58 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.jpg differ diff --git a/bsp/baseq3/textures/gothic_trim/metalsupport4small.data b/bsp/baseq3/textures/gothic_trim/metalsupport4small.data new file mode 100644 index 0000000..2bb9294 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/metalsupport4small.data differ diff --git a/bsp/baseq3/textures/gothic_trim/metalsupport4small.data.h b/bsp/baseq3/textures/gothic_trim/metalsupport4small.data.h new file mode 100644 index 0000000..97a699e --- /dev/null +++ b/bsp/baseq3/textures/gothic_trim/metalsupport4small.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_start __asm("_binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_end __asm("_binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_size __asm("_binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_trim/metalsupport4small.tga b/bsp/baseq3/textures/gothic_trim/metalsupport4small.tga new file mode 100644 index 0000000..728b101 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/metalsupport4small.tga differ diff --git a/bsp/baseq3/textures/gothic_trim/metalsupsolid.data b/bsp/baseq3/textures/gothic_trim/metalsupsolid.data new file mode 100644 index 0000000..3458868 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/metalsupsolid.data differ diff --git a/bsp/baseq3/textures/gothic_trim/metalsupsolid.data.h b/bsp/baseq3/textures/gothic_trim/metalsupsolid.data.h new file mode 100644 index 0000000..068540f --- /dev/null +++ b/bsp/baseq3/textures/gothic_trim/metalsupsolid.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_start __asm("_binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_end __asm("_binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_size __asm("_binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_trim/metalsupsolid.jpg b/bsp/baseq3/textures/gothic_trim/metalsupsolid.jpg new file mode 100644 index 0000000..b93e36b Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/metalsupsolid.jpg differ diff --git a/bsp/baseq3/textures/gothic_trim/supportborder.data b/bsp/baseq3/textures/gothic_trim/supportborder.data new file mode 100644 index 0000000..b1d036a Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/supportborder.data differ diff --git a/bsp/baseq3/textures/gothic_trim/supportborder.data.h b/bsp/baseq3/textures/gothic_trim/supportborder.data.h new file mode 100644 index 0000000..016b6b3 --- /dev/null +++ b/bsp/baseq3/textures/gothic_trim/supportborder.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_supportborder_data_start __asm("_binary_bsp_baseq3_textures_gothic_trim_supportborder_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_supportborder_data_end __asm("_binary_bsp_baseq3_textures_gothic_trim_supportborder_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_supportborder_data_size __asm("_binary_bsp_baseq3_textures_gothic_trim_supportborder_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_trim/supportborder.jpg b/bsp/baseq3/textures/gothic_trim/supportborder.jpg new file mode 100644 index 0000000..30d85c8 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/supportborder.jpg differ diff --git a/bsp/baseq3/textures/gothic_trim/tower_top.data b/bsp/baseq3/textures/gothic_trim/tower_top.data new file mode 100644 index 0000000..a0c5a86 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/tower_top.data differ diff --git a/bsp/baseq3/textures/gothic_trim/tower_top.data.h b/bsp/baseq3/textures/gothic_trim/tower_top.data.h new file mode 100644 index 0000000..f4f259f --- /dev/null +++ b/bsp/baseq3/textures/gothic_trim/tower_top.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_tower_top_data_start __asm("_binary_bsp_baseq3_textures_gothic_trim_tower_top_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_tower_top_data_end __asm("_binary_bsp_baseq3_textures_gothic_trim_tower_top_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_trim_tower_top_data_size __asm("_binary_bsp_baseq3_textures_gothic_trim_tower_top_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_trim/tower_top.jpg b/bsp/baseq3/textures/gothic_trim/tower_top.jpg new file mode 100644 index 0000000..e6ce524 Binary files /dev/null and b/bsp/baseq3/textures/gothic_trim/tower_top.jpg differ diff --git a/bsp/baseq3/textures/gothic_wall/streetbricks10.data b/bsp/baseq3/textures/gothic_wall/streetbricks10.data new file mode 100644 index 0000000..9e372fc Binary files /dev/null and b/bsp/baseq3/textures/gothic_wall/streetbricks10.data differ diff --git a/bsp/baseq3/textures/gothic_wall/streetbricks10.data.h b/bsp/baseq3/textures/gothic_wall/streetbricks10.data.h new file mode 100644 index 0000000..a8e6428 --- /dev/null +++ b/bsp/baseq3/textures/gothic_wall/streetbricks10.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_start __asm("_binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_end __asm("_binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_size __asm("_binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/gothic_wall/streetbricks10.jpg b/bsp/baseq3/textures/gothic_wall/streetbricks10.jpg new file mode 100644 index 0000000..e01f03d Binary files /dev/null and b/bsp/baseq3/textures/gothic_wall/streetbricks10.jpg differ diff --git a/bsp/baseq3/textures/sfx/flame1.data b/bsp/baseq3/textures/sfx/flame1.data new file mode 100644 index 0000000..f890486 Binary files /dev/null and b/bsp/baseq3/textures/sfx/flame1.data differ diff --git a/bsp/baseq3/textures/sfx/flame1.data.h b/bsp/baseq3/textures/sfx/flame1.data.h new file mode 100644 index 0000000..0f5b3e0 --- /dev/null +++ b/bsp/baseq3/textures/sfx/flame1.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_baseq3_textures_sfx_flame1_data_start __asm("_binary_bsp_baseq3_textures_sfx_flame1_data_start"); +extern uint32_t _binary_bsp_baseq3_textures_sfx_flame1_data_end __asm("_binary_bsp_baseq3_textures_sfx_flame1_data_end"); +extern uint32_t _binary_bsp_baseq3_textures_sfx_flame1_data_size __asm("_binary_bsp_baseq3_textures_sfx_flame1_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/baseq3/textures/sfx/flame1.jpg b/bsp/baseq3/textures/sfx/flame1.jpg new file mode 100644 index 0000000..ddc2333 Binary files /dev/null and b/bsp/baseq3/textures/sfx/flame1.jpg differ diff --git a/bsp/20kdm2/gen.sh b/bsp/gen.sh similarity index 63% rename from bsp/20kdm2/gen.sh rename to bsp/gen.sh index f0f23b9..170af88 100644 --- a/bsp/20kdm2/gen.sh +++ b/bsp/gen.sh @@ -1,11 +1,11 @@ while read line; do - filename=$(ls "$line".{tga,jpg} 2>/dev/null) + filename=$(ls */"$line".{tga,jpg} 2>/dev/null) if [ -z $filename ]; then continue; fi name="${filename%.*}" data_name="${name}.data" echo $data_name - python ~/model_generator/color_convert.py $filename rgb565 twiddled $data_name - (cd .. ; make pk/${data_name}.h) -done < textures.txt + python ~/model_generator/color_convert.py $filename rgb565 twiddled mipmapped $data_name + (cd .. ; make bsp/${data_name}.h) +done diff --git a/bsp/katdm3/katdm3.htm b/bsp/katdm3/katdm3.htm new file mode 100644 index 0000000..265d2b2 --- /dev/null +++ b/bsp/katdm3/katdm3.htm @@ -0,0 +1,191 @@ + + + + +Quake3Arena - custom map readme + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  +  Map + and General Information
+
+
 information
  +
+

Title + : katdm3
+ Name: innersanctum
+ Date + : 31st Dec 2002 [dd/mm/yyy] - this ones been sat on the harddrive + for far to long and needs some air..!
+ PK3 file : map-katdm3.pk3
+ Filename : katdm3.bsp
+ Author : Ken 'kat' Beyer
+ Email Address : info@quake3bits.com + (subject 'maps')
+ Website : http://www.quake3bits.co.uk + (currently @..!!)
+ Forum : http://www.cpdt.com/forum
+ Description : a rocky challange, plenty of powerups, close combat...!

+
+
  
 additional + credits
  +
+

: + ID Software for allowing us to do what we do to the game!
+ : Map testers - EMSIPE, + QkennyQ, + Eskimo Roll + Q3W level editing forum
+ : guys @ Q3W-LE + (not in order of appearence..!)
+ : ButterB, Unitool, + Castle, wviperw, arshishb, krekits, (not forgetting...) pjw, + cavefish, rrroooaaarrr, Whiskey7, Muttly, + and anybody else I've fogotten to mention...!
+ +

+
  
 gameplay + information
  +
+

Game + type : ffa, tourney

+

Players + : 4 players (suggested max)
+ Bots : Yes : (optimized) major, klesk, Uriel
+ Weapons : RocketLauncher, ShotGun, GranadeLauncher, PlasmaGun
+ PowerUps : Quad, Invis, MegaHealth

+


+ Unzip the the zip file 'map-katdm3.zip' into your quake3/baseq3 directory + or copy/paste/move 'map-katdm3.pk3' into the baseq3 folder.

+

Start + Quake3Arena, click 'Skermish' and either select 'midnight' from your + map list (picture with 'nidnight' text on it) or press 'tilde' (USA) + or the key above the 'tab' key (UK) to enter the console and type:

+
+

"/map katdm3"

+
+
+
  
 construction
  +
+

Base + : original
+ Editor(s) used : GtKRadiant 1.1-TA beta, GTK1.2.10, q3map2 - + 2.3.23
+ Known Bugs : Haven't discovered any yet but let me know if you do..! +

+

Build + Time : well over 12 months..!!

+

Textures + used : custom, re-edited ID and default

+

Sound + : n/a

+

compile + machine
+ : Athlon 1.2ghz
+ : 768megs RAM, GForce MX2 32mb

+

q3map + compile Time
+ : TOTAL - 10mins (fullVis, -light -filter -patchshadows -super2)

+

Brushes + : c.2871
+ Entities : c.388

+
+
  
 mics + info
  +
+

Distribution + / Copyright / Permissions
+ Feel free to distribute the files AS IS. All I ask is you give credit + where it's due! Do not edit this text file under pain of a good spanking..!.

+

Copyright + © 2003 Ken Beyer (info@quake3bits.com + - subject 'maps')

+


+ Quake III Arena is a registered trademark of id Software, Inc.

+
+
+

 

+ 		 
+ + + + diff --git a/bsp/katdm3/katdm3.jpg b/bsp/katdm3/katdm3.jpg new file mode 100644 index 0000000..b69268e Binary files /dev/null and b/bsp/katdm3/katdm3.jpg differ diff --git a/bsp/katdm3/katdm3_README.txt b/bsp/katdm3/katdm3_README.txt new file mode 100644 index 0000000..67277bc --- /dev/null +++ b/bsp/katdm3/katdm3_README.txt @@ -0,0 +1,82 @@ + * Map and General Information * + +Information +================================================================ +Title : Midnight +Date : 31st Dec 02 +PK3 file : map-katdm3.pk3 +Filename : katdm3.bsp +Author : Ken 'kat' Beyer +Email Address : cpdt@telinco.co.uk (subject 'maps') +Website : http://www.quake3bits.co.uk +Forum : http://www.cpdt.com/forum +Description : + : + +Additional Credits + : ID Software for allowing us to do what we do to the game! + : Map testers - EMSIPE, QkennyQ, Eskimo Roll + : guys @ Q3W-LE (not in order of appearence..!) + : ButterB, Unitool, Castle, wviperw, arshishb, krekits, (not forgetting...) pjw, cavefish, rrroooaaarrr, Whiskey7, Muttly, and anybody else I've fogotten to mention...! + : torch model by ken 'kat' beyer + : 'Oak' Trees by GrimReaper + : ....anybody else I've forgotten to mention..! + + +================================================================ + +Play Information + +Game type : Undecided as of now..! + +Players : 4 players (recommended) +Bots : Yes. (aas included - 'optimized') +Weapons : RocketLauncher, PlasmaGun, ShotGun, Granade Launcher +Power Ups : Quad, Invisibility, Mega Health + + +Remove the previous beta if you installed it. Unzip the the zip file 'map-katdm3.zip' into your quake3/baseq3 directory or copy/paste/move 'map-katdm5.pk3' from WinZip into the baseq3 folder. + +Start Quake3Arena or Team Arena, click 'Skermish/Start Server' and either select 'katdm5' from your map list or press 'tilde' (USA) or the key above the 'tab' key (UK) to enter the console and type: + + "/map katdm3" + + + + +================================================================ + + +Construction + +Base : nothing +Editor(s) used : GTKRadiant 1.1TAbeta, GTK 1.1.1 (BobsToolz), Q3ME (front end compiler) +Known Bugs : Haven't discovered any yet but let me know if you do..! + +Build Time : well over 12 months + +Textures used : Custom + : +Sound : n/a + +Compile machine + : Athlon 1.2 + : 768megs RAM, Gforce2 MX 32MB + +q3map compile Time + : TOTAL - 1hr mins + +Brushes : +Entities : + + +=============================================================== + + +Distribution / Copyright / Permissions +Feel free to distribute the files AS IS. All I ask is you give credit where it's due! Do not edit this text file under pain of a good spanking..!. + +Copyright © 2002 Ken Beyer (cpdt@telinco.co.uk - subject 'maps') + + +Quake III Arena is a registered trademark of id Software, Inc. \ No newline at end of file diff --git a/bsp/katdm3/levelshots/katdm3.jpg b/bsp/katdm3/levelshots/katdm3.jpg new file mode 100644 index 0000000..b69268e Binary files /dev/null and b/bsp/katdm3/levelshots/katdm3.jpg differ diff --git a/bsp/katdm3/map-katdm3.pk3 b/bsp/katdm3/map-katdm3.pk3 new file mode 100644 index 0000000..5808c8e Binary files /dev/null and b/bsp/katdm3/map-katdm3.pk3 differ diff --git a/bsp/katdm3/maps/katdm3.aas b/bsp/katdm3/maps/katdm3.aas new file mode 100644 index 0000000..9c7ed57 Binary files /dev/null and b/bsp/katdm3/maps/katdm3.aas differ diff --git a/bsp/katdm3/maps/katdm3.bsp b/bsp/katdm3/maps/katdm3.bsp new file mode 100644 index 0000000..eb00ca6 Binary files /dev/null and b/bsp/katdm3/maps/katdm3.bsp differ diff --git a/bsp/katdm3/maps/katdm3.bsp.h b/bsp/katdm3/maps/katdm3.bsp.h new file mode 100644 index 0000000..7c69286 --- /dev/null +++ b/bsp/katdm3/maps/katdm3.bsp.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_maps_katdm3_bsp_start __asm("_binary_bsp_katdm3_maps_katdm3_bsp_start"); +extern uint32_t _binary_bsp_katdm3_maps_katdm3_bsp_end __asm("_binary_bsp_katdm3_maps_katdm3_bsp_end"); +extern uint32_t _binary_bsp_katdm3_maps_katdm3_bsp_size __asm("_binary_bsp_katdm3_maps_katdm3_bsp_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data b/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data new file mode 100644 index 0000000..3d17cd8 Binary files /dev/null and b/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data differ diff --git a/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data.h b/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data.h new file mode 100644 index 0000000..d204fe2 --- /dev/null +++ b/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_start __asm("_binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_start"); +extern uint32_t _binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_end __asm("_binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_end"); +extern uint32_t _binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_size __asm("_binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.tga b/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.tga new file mode 100644 index 0000000..807024b Binary files /dev/null and b/bsp/katdm3/models/mapobjects/kt_torch/kt_torch.tga differ diff --git a/bsp/katdm3/models/mapobjects/oak/oakblaetter.data b/bsp/katdm3/models/mapobjects/oak/oakblaetter.data new file mode 100644 index 0000000..18c96a6 Binary files /dev/null and b/bsp/katdm3/models/mapobjects/oak/oakblaetter.data differ diff --git a/bsp/katdm3/models/mapobjects/oak/oakblaetter.data.h b/bsp/katdm3/models/mapobjects/oak/oakblaetter.data.h new file mode 100644 index 0000000..02cd554 --- /dev/null +++ b/bsp/katdm3/models/mapobjects/oak/oakblaetter.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_start __asm("_binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_start"); +extern uint32_t _binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_end __asm("_binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_end"); +extern uint32_t _binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_size __asm("_binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/models/mapobjects/oak/oakblaetter.tga b/bsp/katdm3/models/mapobjects/oak/oakblaetter.tga new file mode 100644 index 0000000..18220ed Binary files /dev/null and b/bsp/katdm3/models/mapobjects/oak/oakblaetter.tga differ diff --git a/bsp/katdm3/models/mapobjects/oak/oakstamm.data b/bsp/katdm3/models/mapobjects/oak/oakstamm.data new file mode 100644 index 0000000..edc6ed7 Binary files /dev/null and b/bsp/katdm3/models/mapobjects/oak/oakstamm.data differ diff --git a/bsp/katdm3/models/mapobjects/oak/oakstamm.data.h b/bsp/katdm3/models/mapobjects/oak/oakstamm.data.h new file mode 100644 index 0000000..f143a12 --- /dev/null +++ b/bsp/katdm3/models/mapobjects/oak/oakstamm.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_models_mapobjects_oak_oakstamm_data_start __asm("_binary_bsp_katdm3_models_mapobjects_oak_oakstamm_data_start"); +extern uint32_t _binary_bsp_katdm3_models_mapobjects_oak_oakstamm_data_end __asm("_binary_bsp_katdm3_models_mapobjects_oak_oakstamm_data_end"); +extern uint32_t _binary_bsp_katdm3_models_mapobjects_oak_oakstamm_data_size __asm("_binary_bsp_katdm3_models_mapobjects_oak_oakstamm_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/models/mapobjects/oak/oakstamm.jpg b/bsp/katdm3/models/mapobjects/oak/oakstamm.jpg new file mode 100644 index 0000000..41f36b4 Binary files /dev/null and b/bsp/katdm3/models/mapobjects/oak/oakstamm.jpg differ diff --git a/bsp/katdm3/scripts/katdm3.arena b/bsp/katdm3/scripts/katdm3.arena new file mode 100644 index 0000000..8b19a7e --- /dev/null +++ b/bsp/katdm3/scripts/katdm3.arena @@ -0,0 +1,8 @@ +{ +map "katdm3" +bots "klesk major uriel" +longname "inner sanctum" +fraglimit 10 +timelimit 20 +type "ffa team" +} \ No newline at end of file diff --git a/bsp/katdm3/scripts/katdm3_README.txt b/bsp/katdm3/scripts/katdm3_README.txt new file mode 100644 index 0000000..67277bc --- /dev/null +++ b/bsp/katdm3/scripts/katdm3_README.txt @@ -0,0 +1,82 @@ + * Map and General Information * + +Information +================================================================ +Title : Midnight +Date : 31st Dec 02 +PK3 file : map-katdm3.pk3 +Filename : katdm3.bsp +Author : Ken 'kat' Beyer +Email Address : cpdt@telinco.co.uk (subject 'maps') +Website : http://www.quake3bits.co.uk +Forum : http://www.cpdt.com/forum +Description : + : + +Additional Credits + : ID Software for allowing us to do what we do to the game! + : Map testers - EMSIPE, QkennyQ, Eskimo Roll + : guys @ Q3W-LE (not in order of appearence..!) + : ButterB, Unitool, Castle, wviperw, arshishb, krekits, (not forgetting...) pjw, cavefish, rrroooaaarrr, Whiskey7, Muttly, and anybody else I've fogotten to mention...! + : torch model by ken 'kat' beyer + : 'Oak' Trees by GrimReaper + : ....anybody else I've forgotten to mention..! + + +================================================================ + +Play Information + +Game type : Undecided as of now..! + +Players : 4 players (recommended) +Bots : Yes. (aas included - 'optimized') +Weapons : RocketLauncher, PlasmaGun, ShotGun, Granade Launcher +Power Ups : Quad, Invisibility, Mega Health + + +Remove the previous beta if you installed it. Unzip the the zip file 'map-katdm3.zip' into your quake3/baseq3 directory or copy/paste/move 'map-katdm5.pk3' from WinZip into the baseq3 folder. + +Start Quake3Arena or Team Arena, click 'Skermish/Start Server' and either select 'katdm5' from your map list or press 'tilde' (USA) or the key above the 'tab' key (UK) to enter the console and type: + + "/map katdm3" + + + + +================================================================ + + +Construction + +Base : nothing +Editor(s) used : GTKRadiant 1.1TAbeta, GTK 1.1.1 (BobsToolz), Q3ME (front end compiler) +Known Bugs : Haven't discovered any yet but let me know if you do..! + +Build Time : well over 12 months + +Textures used : Custom + : +Sound : n/a + +Compile machine + : Athlon 1.2 + : 768megs RAM, Gforce2 MX 32MB + +q3map compile Time + : TOTAL - 1hr mins + +Brushes : +Entities : + + +=============================================================== + + +Distribution / Copyright / Permissions +Feel free to distribute the files AS IS. All I ask is you give credit where it's due! Do not edit this text file under pain of a good spanking..!. + +Copyright © 2002 Ken Beyer (cpdt@telinco.co.uk - subject 'maps') + + +Quake III Arena is a registered trademark of id Software, Inc. \ No newline at end of file diff --git a/bsp/katdm3/scripts/kt_torch.shader b/bsp/katdm3/scripts/kt_torch.shader new file mode 100644 index 0000000..31a4748 --- /dev/null +++ b/bsp/katdm3/scripts/kt_torch.shader @@ -0,0 +1,72 @@ +//kt_torch md3 map model (c) ken 'kat' beyer +//script modified from id original + + +//torch with no flame +models/mapobjects/kt_torch/kt_torch +{ + cull disable + + { + map models/mapobjects/kt_torch/kt_torch.tga + alphaFunc GE128 + depthWrite + rgbGen vertex + } + + +} + +//torch with yellow flame +models/mapobjects/kt_torch/kt_torch_flame +{ + cull disable + + { + map models/mapobjects/kt_torch/kt_torch.tga + alphaFunc GE128 + depthWrite + rgbGen vertex + } + + +} + +//torch with smoke plume +models/mapobjects/kt_torch/kt_torch_smoke +{ + cull disable + + { + map models/mapobjects/kt_torch/kt_torch.tga + alphaFunc GE128 + depthWrite + rgbGen vertex + } + + +} + +//kt_smoke - modified from id original script + +textures/kt_misc/kt_smoke +{ + + surfaceparm nomarks + surfaceparm nolightmap + cull none + + + { + animMap 10 textures/kt_misc/smoke1.jpg textures/kt_misc/smoke2.jpg textures/kt_misc/smoke3.jpg textures/kt_misc/smoke4.jpg textures/kt_misc/smoke5.jpg textures/kt_misc/smoke6.jpg textures/kt_misc/smoke7.jpg textures/kt_misc/smoke8.jpg + blendFunc GL_ONE GL_ONE + rgbGen wave inverseSawtooth 0 1 0 10 + } + + { + animMap 10 textures/kt_misc/smoke2.jpg textures/kt_misc/smoke3.jpg textures/kt_misc/smoke4.jpg textures/kt_misc/smoke5.jpg textures/kt_misc/smoke6.jpg textures/kt_misc/smoke7.jpg textures/kt_misc/smoke8.jpg textures/kt_misc/smoke1.jpg + blendFunc GL_ONE GL_ONE + rgbGen wave sawtooth 0 1 0 10 + } + +} diff --git a/bsp/katdm3/scripts/oak.shader b/bsp/katdm3/scripts/oak.shader new file mode 100644 index 0000000..aa7a228 --- /dev/null +++ b/bsp/katdm3/scripts/oak.shader @@ -0,0 +1,41 @@ +// Oak-mapmodel + +models/mapobjects/oak/oakblaetter +{ + cull none + nopicmip + + { + map models/mapobjects/oak/oakblaetter.tga + alphaFunc GE128 + depthWrite + rgbGen vertex + } +} + +models/mapobjects/oak/oakblaetter2 +{ + cull none + nopicmip + + { + map models/mapobjects/oak/oakblaetter2.tga + alphaFunc GE128 + depthWrite + rgbGen vertex + } +} + +models/mapobjects/oak/oakblaetter3 +{ + cull none + nopicmip + + { + map models/mapobjects/oak/oakblaetter3.tga + alphaFunc GE128 + depthWrite + rgbGen vertex + } +} + diff --git a/bsp/katdm3/texture.h b/bsp/katdm3/texture.h new file mode 100644 index 0000000..04fa751 --- /dev/null +++ b/bsp/katdm3/texture.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +struct pk_texture { + void * start; + uint32_t size; + uint32_t offset; + int16_t width; + int16_t height; + //float u_mul; + float v_mul; +}; + +struct pk_texture textures[] = { + #include "texture.inc" +}; diff --git a/bsp/katdm3/texture.inc b/bsp/katdm3/texture.inc new file mode 100644 index 0000000..fc83c17 --- /dev/null +++ b/bsp/katdm3/texture.inc @@ -0,0 +1,288 @@ +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 0, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_size, + .offset = 0, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_trim_metalsupport4small_data_size, + .offset = 174768, + .width = 64, + .height = 64, + .v_mul = 1.0, // 64 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 185696, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 185696, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 185696, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_size, + .offset = 185696, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 360464, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 360464, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 360464, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 360464, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_floor_largerblock3b3x128_data_size, + .offset = 360464, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 535232, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_size, + .offset = 535232, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_a_data_size, + .offset = 710000, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_size, + .offset = 884768, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_block_smblk3b3dim_wall_data_size, + .offset = 1059536, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_trim_border2_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_trim_border2_data_size, + .offset = 1234304, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_wall_streetbricks10_data_size, + .offset = 1409072, + .width = 128, + .height = 128, + .v_mul = 1.0, // 128 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_block_blocks18b_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_block_blocks18b_data_size, + .offset = 1452768, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_trim_metalsupsolid_data_size, + .offset = 1627536, + .width = 128, + .height = 128, + .v_mul = 1.0, // 128 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_trim_km_arena1tower4_data_size, + .offset = 1671232, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_trim_supportborder_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_trim_supportborder_data_size, + .offset = 1846000, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_gothic_trim_tower_top_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_gothic_trim_tower_top_data_size, + .offset = 2020768, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_size, + .offset = 2195536, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 2370304, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 2370304, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_size, + .offset = 2370304, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 2545072, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_size, + .offset = 2545072, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_size, + .offset = 2719840, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_models_mapobjects_kt_torch_kt_torch_data_size, + .offset = 2894608, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_textures_sfx_flame1_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_textures_sfx_flame1_data_size, + .offset = 3069376, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)0, + .size = (uint32_t)0, + .offset = 3244144, + .width = 0, + .height = 0, + .v_mul = 0, // 0 +}, +{ + .start = (void *)&_binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_start, + .size = (uint32_t)&_binary_bsp_katdm3_models_mapobjects_oak_oakblaetter_data_size, + .offset = 3244144, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, +{ + .start = (void *)&_binary_bsp_baseq3_models_mapobjects_skel_skel_data_start, + .size = (uint32_t)&_binary_bsp_baseq3_models_mapobjects_skel_skel_data_size, + .offset = 3418912, + .width = 256, + .height = 256, + .v_mul = 1.0, // 256 +}, diff --git a/bsp/katdm3/textures.txt b/bsp/katdm3/textures.txt new file mode 100644 index 0000000..ba8561f --- /dev/null +++ b/bsp/katdm3/textures.txt @@ -0,0 +1,36 @@ +textures/common/caulk +textures/katdm3/kt_rivit-strap2_cont_dk +textures/gothic_trim/metalsupport4small +noshader +textures/common/hint +textures/common/clip +textures/katdm3/kt_rock_1f_shiny_dk +textures/common/botclip +textures/common/clusterportal +textures/liquids/clear_calm1 +textures/common/nodraw +textures/gothic_floor/largerblock3b3x128 +textures/skies/kcbasesky_arena1_sky +textures/katdm3/kt_rock_1f_rot_fade +textures/gothic_trim/km_arena1tower4_a +textures/katdm3/kattex-3-stone-bmp +textures/gothic_block/smblk3b3dim_wall +textures/gothic_trim/border2 +textures/gothic_wall/streetbricks10 +textures/gothic_block/blocks18b +textures/gothic_trim/metalsupsolid +textures/gothic_trim/km_arena1tower4 +textures/gothic_trim/supportborder +textures/gothic_trim/tower_top +textures/katdm3/kt_rock_1f_rot_shiny +textures/katdm3/kt_rock_1f_rot_big2 +textures/common/weapclip +textures/katdm3/kattex-3-stone-bmp_rot +textures/katdm3/kt_rock_1f_rot_big +textures/katdm3/kattex-3-stone-bmp_fade +textures/katdm3/kt_wood_rough +models/mapobjects/kt_torch/kt_torch +textures/sfx/flame1 +models/mapobjects/oak/oakstamm +models/mapobjects/oak/oakblaetter +models/mapobjects/skel/skel diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data new file mode 100644 index 0000000..4bcb10e Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data differ diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data.h b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data.h new file mode 100644 index 0000000..2378726 --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.tga b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.tga new file mode 100644 index 0000000..690b21f Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.tga differ diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data new file mode 100644 index 0000000..e182bf6 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data differ diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data.h b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data.h new file mode 100644 index 0000000..5c86603 --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_fade_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.tga b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.tga new file mode 100644 index 0000000..4458f3d Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.tga differ diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data new file mode 100644 index 0000000..44fc775 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data differ diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data.h b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data.h new file mode 100644 index 0000000..74bb169 --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kattex_3_stone_bmp_rot_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.tga b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.tga new file mode 100644 index 0000000..b55d295 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.tga differ diff --git a/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data b/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data new file mode 100644 index 0000000..f3a7fe8 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data differ diff --git a/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data.h b/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data.h new file mode 100644 index 0000000..79ef42f --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kt_rivit_strap2_cont_dk_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.tga b/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.tga new file mode 100644 index 0000000..43a9246 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.tga differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.data b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.data new file mode 100644 index 0000000..f109203 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.data differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.data.h b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.data.h new file mode 100644 index 0000000..3589d88 --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.tga b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.tga new file mode 100644 index 0000000..83b888d Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big.tga differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.data b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.data new file mode 100644 index 0000000..882fff9 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.data differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.data.h b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.data.h new file mode 100644 index 0000000..eeaf28c --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big2_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big2_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big2_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big2_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big2_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_big2_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.tga b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.tga new file mode 100644 index 0000000..14464f1 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_big2.tga differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data new file mode 100644 index 0000000..a3afbe2 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data.h b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data.h new file mode 100644 index 0000000..b8c8abd --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_fade_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.tga b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.tga new file mode 100644 index 0000000..48545af Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.tga differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data new file mode 100644 index 0000000..87257fe Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data.h b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data.h new file mode 100644 index 0000000..bd72853 --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_rot_shiny_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.tga b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.tga new file mode 100644 index 0000000..b73a3a9 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.tga differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data b/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data new file mode 100644 index 0000000..20ce0b6 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data differ diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data.h b/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data.h new file mode 100644 index 0000000..f8db628 --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kt_rock_1f_shiny_dk_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.tga b/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.tga new file mode 100644 index 0000000..bb54438 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.tga differ diff --git a/bsp/katdm3/textures/katdm3/kt_wood_rough.data b/bsp/katdm3/textures/katdm3/kt_wood_rough.data new file mode 100644 index 0000000..f7d41ea Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_wood_rough.data differ diff --git a/bsp/katdm3/textures/katdm3/kt_wood_rough.data.h b/bsp/katdm3/textures/katdm3/kt_wood_rough.data.h new file mode 100644 index 0000000..8da5e87 --- /dev/null +++ b/bsp/katdm3/textures/katdm3/kt_wood_rough.data.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_start __asm("_binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_start"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_end __asm("_binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_end"); +extern uint32_t _binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_size __asm("_binary_bsp_katdm3_textures_katdm3_kt_wood_rough_data_size"); + +#ifdef __cplusplus +} +#endif diff --git a/bsp/katdm3/textures/katdm3/kt_wood_rough.tga b/bsp/katdm3/textures/katdm3/kt_wood_rough.tga new file mode 100644 index 0000000..5bb4388 Binary files /dev/null and b/bsp/katdm3/textures/katdm3/kt_wood_rough.tga differ diff --git a/bsp/texture_gen.py b/bsp/texture_gen.py index ef6d14e..786149e 100644 --- a/bsp/texture_gen.py +++ b/bsp/texture_gen.py @@ -11,8 +11,8 @@ def read_texture_names(): return lines def glob_and_filter(name): - filenames = glob(f"{name}.tga") + glob(f"{name}.jpg") - assert len(filenames) in {0, 1} + filenames = glob(f"*/{name}.tga") + glob(f"*/{name}.jpg") + assert len(filenames) in {0, 1}, filenames filename = filenames[0] if filenames else None return filename @@ -45,7 +45,22 @@ class Texture: npot_size: Size offset: int +mipmapped = False + +def mip_size(n): + if n == 0: + return 0 + size = 6 + while n > 0: + size += n * n * 2 + n >>= 1 + return size + +assert mip_size(256) == 0x2aab0, hex(mip_size(256)) + def texture_metadata(): + global mipmapped + names = read_texture_names() acc = 0 for name in names: @@ -53,6 +68,12 @@ def texture_metadata(): w, h = image_size(filename) nw, nh = npot(w), npot(h) + if w > 256: + name = None + filename = None + w, h, nw, nh = 0, 0, 0, 0 + elif filename: + print(filename) yield Texture( name, filename, @@ -61,14 +82,19 @@ def texture_metadata(): acc ) - acc += nw * h + if mipmapped: + assert w == h and nw == w, (w, h) + acc += mip_size(w) + else: + acc += nw * h * 2 + assert acc <= (0x80_0000 - 0x37_1800), acc def name_to_bin(filename): if filename is None: return None else: name, ext = path.splitext(filename) - return "_binary_pk_" + name.replace('/', '_').replace('.', '_') + "_data" + return f"_binary_bsp_" + name.replace('/', '_').replace('.', '_').replace('-', '_') + "_data" def uv_mul(texture): u = 0 if texture.npot_size.w == 0 else texture.real_size.w / texture.npot_size.w @@ -96,8 +122,15 @@ def render_texture_metadatas(): yield from render_texture_metadata(texture) def main(): + global mipmapped + out_filename = sys.argv[1] + is_mipmapped = sys.argv[2] + assert is_mipmapped in {"mipmapped", "non_mipmapped"} + mipmapped = is_mipmapped == "mipmapped" + render, out = renderer() render(render_texture_metadatas()) - sys.stdout.write(out.getvalue()) + with open(out_filename, "w") as f: + f.write(out.getvalue()) main() diff --git a/example/bsp/bsp.mk b/example/bsp/bsp.mk index e87602e..1a06349 100644 --- a/example/bsp/bsp.mk +++ b/example/bsp/bsp.mk @@ -40,3 +40,48 @@ BSP_20KDM2_OBJ = \ example/bsp/20kdm2.elf: LDSCRIPT = $(LIB)/main.lds example/bsp/20kdm2.elf: $(START_OBJ) $(BSP_20KDM2_OBJ) + +BSP_KATDM3_OBJ = \ + example/bsp/katdm3.o \ + holly/core.o \ + holly/region_array.o \ + holly/background.o \ + holly/ta_fifo_polygon_converter.o \ + holly/video_output.o \ + sh7091/serial.o \ + sh7091/c_serial.o \ + printf/printf.o \ + printf/unparse.o \ + printf/parse.o \ + interrupt.o \ + maple/maple.o \ + font/font_bitmap.o \ + font/verite_8x16/verite_8x16.data.o \ + bsp/katdm3/maps/katdm3.bsp.o \ + bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data.o \ + bsp/baseq3/textures/gothic_trim/metalsupport4small.data.o \ + bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data.o \ + bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data.o \ + bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data.o \ + bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data.o \ + bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data.o \ + bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data.o \ + bsp/baseq3/textures/gothic_trim/border2.data.o \ + bsp/baseq3/textures/gothic_wall/streetbricks10.data.o \ + bsp/baseq3/textures/gothic_block/blocks18b.data.o \ + bsp/baseq3/textures/gothic_trim/metalsupsolid.data.o \ + bsp/baseq3/textures/gothic_trim/km_arena1tower4.data.o \ + bsp/baseq3/textures/gothic_trim/supportborder.data.o \ + bsp/baseq3/textures/gothic_trim/tower_top.data.o \ + bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data.o \ + bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data.o \ + bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data.o \ + bsp/katdm3/textures/katdm3/kt_wood_rough.data.o \ + bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data.o \ + bsp/baseq3/textures/sfx/flame1.data.o \ + bsp/katdm3/models/mapobjects/oak/oakblaetter.data.o \ + bsp/baseq3/models/mapobjects/skel/skel.data.o \ + $(LIBGCC) + +example/bsp/katdm3.elf: LDSCRIPT = $(LIB)/main.lds +example/bsp/katdm3.elf: $(START_OBJ) $(BSP_KATDM3_OBJ) diff --git a/example/bsp/katdm3.cpp b/example/bsp/katdm3.cpp new file mode 100644 index 0000000..31d8bd5 --- /dev/null +++ b/example/bsp/katdm3.cpp @@ -0,0 +1,1449 @@ +#include + +#include "holly/background.hpp" +#include "holly/core.hpp" +#include "holly/core_bits.hpp" +#include "holly/holly.hpp" +#include "holly/isp_tsp.hpp" +#include "holly/region_array.hpp" +#include "holly/ta_bits.hpp" +#include "holly/ta_fifo_polygon_converter.hpp" +#include "holly/ta_global_parameter.hpp" +#include "holly/ta_parameter.hpp" +#include "holly/ta_vertex_parameter.hpp" +#include "holly/texture_memory_alloc3.hpp" +#include "holly/video_output.hpp" + +#include "systembus.hpp" +#include "systembus_bits.hpp" + +#include "maple/maple.hpp" +#include "maple/maple_host_command_writer.hpp" +#include "maple/maple_bus_bits.hpp" +#include "maple/maple_bus_commands.hpp" +#include "maple/maple_bus_ft0.hpp" + +#include "memorymap.hpp" + +#include "sh7091/sh7091.hpp" +#include "sh7091/sh7091_bits.hpp" +#include "sh7091/serial.hpp" +#include "printf/printf.h" + +#include "math/vec2.hpp" +#include "math/vec3.hpp" +#include "math/vec4.hpp" +#include "math/mat2x2.hpp" +#include "math/mat3x3.hpp" +#include "math/mat4x4.hpp" +#include "math/geometry.hpp" + +#include "interrupt.hpp" + +#include "bsp/katdm3/textures/katdm3/kt_rivit-strap2_cont_dk.data.h" +#include "bsp/baseq3/textures/gothic_trim/metalsupport4small.data.h" +#include "bsp/katdm3/textures/katdm3/kt_rock_1f_shiny_dk.data.h" +#include "bsp/baseq3/textures/gothic_floor/largerblock3b3x128.data.h" +#include "bsp/katdm3/textures/katdm3/kt_rock_1f_rot_fade.data.h" +#include "bsp/baseq3/textures/gothic_trim/km_arena1tower4_a.data.h" +#include "bsp/katdm3/textures/katdm3/kattex-3-stone-bmp.data.h" +#include "bsp/baseq3/textures/gothic_block/smblk3b3dim_wall.data.h" +#include "bsp/baseq3/textures/gothic_trim/border2.data.h" +#include "bsp/baseq3/textures/gothic_wall/streetbricks10.data.h" +#include "bsp/baseq3/textures/gothic_block/blocks18b.data.h" +#include "bsp/baseq3/textures/gothic_trim/metalsupsolid.data.h" +#include "bsp/baseq3/textures/gothic_trim/km_arena1tower4.data.h" +#include "bsp/baseq3/textures/gothic_trim/supportborder.data.h" +#include "bsp/baseq3/textures/gothic_trim/tower_top.data.h" +#include "bsp/katdm3/textures/katdm3/kt_rock_1f_rot_shiny.data.h" +#include "bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_rot.data.h" +#include "bsp/katdm3/textures/katdm3/kattex-3-stone-bmp_fade.data.h" +#include "bsp/katdm3/textures/katdm3/kt_wood_rough.data.h" +#include "bsp/katdm3/models/mapobjects/kt_torch/kt_torch.data.h" +#include "bsp/baseq3/textures/sfx/flame1.data.h" +#include "bsp/katdm3/models/mapobjects/oak/oakblaetter.data.h" +#include "bsp/baseq3/models/mapobjects/skel/skel.data.h" + +#include "q3bsp/q3bsp.h" +#include "bsp/katdm3/maps/katdm3.bsp.h" +#include "bsp/katdm3/texture.h" + +#include "model/model.h" +#include "model/icosphere/model.h" + +#include "font/font_bitmap.hpp" +#include "font/verite_8x16/verite_8x16.data.h" +#include "palette.hpp" +#include "printf/unparse.h" + +#include "assert.h" + +constexpr int font_offset = ((0x7f - 0x20) + 1) * 8 * 16 / 2; + +using vec2 = vec<2, float>; +using vec3 = vec<3, float>; +using vec4 = vec<4, float>; +using mat4x4 = mat<4, 4, float>; + +#define _fsrra(n) (1.0f / (__builtin_sqrtf(n))) + +static vec3 sphere_position = {890, 480, 450}; + +static ft0::data_transfer::data_format data[4]; + +static uint8_t send_buf[1024] __attribute__((aligned(32))) = {}; +static uint8_t recv_buf[1024] __attribute__((aligned(32))) = {}; + +void do_device_request() +{ + uint8_t send_buf[1024] __attribute__((aligned(32))); + uint8_t recv_buf[1024] __attribute__((aligned(32))); + + auto writer = maple::host_command_writer(send_buf, recv_buf); + + using command_type = maple::device_request; + using response_type = maple::device_status; + + auto [host_command, host_response] + = writer.append_command_all_ports(); + + maple::dma_start(send_buf, writer.send_offset, + recv_buf, writer.recv_offset); + maple::dma_wait_complete(); + + for (uint8_t port = 0; port < 4; port++) { + auto& bus_data = host_response[port].bus_data; + auto& data_fields = bus_data.data_fields; + if (bus_data.command_code != maple::device_status::command_code) { + serial::string("port: "); + serial::integer(port); + serial::string(" disconnected\n"); + } else { + serial::string("port: "); + serial::integer(port); + serial::string(" ft: "); + serial::integer(std::byteswap(data_fields.device_id.ft)); + serial::string(" fd[0]: "); + serial::integer(std::byteswap(data_fields.device_id.fd[0])); + serial::string(" fd[1]: "); + serial::integer(std::byteswap(data_fields.device_id.fd[1])); + serial::string(" fd[2]: "); + serial::integer(std::byteswap(data_fields.device_id.fd[2])); + serial::string(" source_ap.lm_bus: "); + serial::integer(bus_data.source_ap & ap::lm_bus::bit_mask); + } + } +} + +void do_get_condition() +{ + auto writer = maple::host_command_writer(send_buf, recv_buf); + + using command_type = maple::get_condition; + using response_type = maple::data_transfer; + + auto [host_command, host_response] + = writer.append_command_all_ports(); + + for (int port = 0; port < 4; port++) { + auto& data_fields = host_command[port].bus_data.data_fields; + data_fields.function_type = std::byteswap(function_type::controller); + } + maple::dma_start(send_buf, writer.send_offset, + recv_buf, writer.recv_offset); + maple::dma_wait_complete(); + + for (uint8_t port = 0; port < 1; port++) { + auto& bus_data = host_response[port].bus_data; + if (bus_data.command_code != response_type::command_code) { + printf("no data cc %x %x\n", bus_data.command_code, response_type::command_code); + return; + } + auto& data_fields = bus_data.data_fields; + if ((std::byteswap(data_fields.function_type) & function_type::controller) == 0) { + printf("no data ft %x\n", std::byteswap(data_fields.function_type)); + return; + } + + data[port].digital_button = data_fields.data.digital_button; + for (int i = 0; i < 6; i++) { + data[port].analog_coordinate_axis[i] + = data_fields.data.analog_coordinate_axis[i]; + } + } +} + +struct position_normal { + vec3 position; + vec3 normal; +}; + +static uint8_t face_cache[16384]; + +static position_normal vertex_cache[16384]; + +static inline vec3 normal_transform(const mat4x4& trans, vec3 normal) +{ + vec4 n = trans * (vec4){normal.x, normal.y, normal.z, 0.f}; // no translation component + return {n.x, n.y, n.z}; +} + +static inline vec3 screen_transform(vec3 v) +{ + float dim = 480 / 2.0; + + return { + v.x / (1.f * v.z) * dim + 640 / 2.0f, + v.y / (1.f * v.z) * dim + 480 / 2.0f, + 1 / v.z, + }; +} + +void global_polygon_type_0(ta_parameter_writer& writer) +{ + const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume + | para_control::list_type::translucent + | obj_control::col_type::packed_color + ; + + const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::depth_compare_mode::greater + | isp_tsp_instruction_word::culling_mode::no_culling; + + const uint32_t tsp_instruction_word = tsp_instruction_word::fog_control::no_fog + | tsp_instruction_word::src_alpha_instr::src_alpha + | tsp_instruction_word::dst_alpha_instr::inverse_src_alpha + | tsp_instruction_word::use_alpha + ; + + const uint32_t texture_control_word = 0; + + writer.append() = + ta_global_parameter::polygon_type_0(parameter_control_word, + isp_tsp_instruction_word, + tsp_instruction_word, + texture_control_word, + 0, // data_size_for_sort_dma + 0 // next_address_for_sort_dma + ); +} + +void global_polygon_type_1(ta_parameter_writer& writer, + uint32_t obj_control_texture, + uint32_t texture_u_v_size, + uint32_t texture_control_word, + const float a = 1.0f, + const float r = 1.0f, + const float g = 1.0f, + const float b = 1.0f + ) +{ + const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume + | para_control::list_type::opaque + | obj_control::col_type::intensity_mode_1 + | obj_control::gouraud + | obj_control_texture + ; + + const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::depth_compare_mode::greater + | isp_tsp_instruction_word::culling_mode::cull_if_negative + ; + + const uint32_t tsp_instruction_word = tsp_instruction_word::fog_control::no_fog + | tsp_instruction_word::src_alpha_instr::one + | tsp_instruction_word::dst_alpha_instr::zero + //| tsp_instruction_word::filter_mode::bilinear_filter + | tsp_instruction_word::texture_shading_instruction::modulate + | texture_u_v_size + ; + + writer.append() = + ta_global_parameter::polygon_type_1(parameter_control_word, + isp_tsp_instruction_word, + tsp_instruction_word, + texture_control_word, + a, + r, + g, + b + ); +} + +void global_texture(ta_parameter_writer& writer, int ix) +{ + struct pk_texture * texture = &textures[ix]; + + uint32_t texture_u_v_size = tsp_instruction_word::texture_u_size::from_int(texture->width) + | tsp_instruction_word::texture_v_size::from_int(texture->height) + ; + + uint32_t texture_address = texture_memory_alloc.texture.start + font_offset + texture->offset; + uint32_t texture_control_word = texture_control_word::mip_mapped + | texture_control_word::pixel_format::_565 + | texture_control_word::scan_order::twiddled + | texture_control_word::texture_address(texture_address / 8) + ; + + global_polygon_type_1(writer, + obj_control::texture, + texture_u_v_size, + texture_control_word); +} + +void transform_vertices(uint8_t * buf, int length, const mat4x4& trans) +{ + q3bsp_vertex_t * vert = reinterpret_cast(buf); + + int count = length / (sizeof (struct q3bsp_vertex)); + + for (int i = 0; i < count; i++) { + vec3 v = {vert[i].position[0], vert[i].position[1], vert[i].position[2]}; + vec3 n = {vert[i].normal[0], vert[i].normal[1], vert[i].normal[2]}; + + //printf("%f %f %f\n", v.x, v.y, v.z); + + vertex_cache[i].position = trans * v; + vertex_cache[i].normal = normal_transform(trans, n); + } +} + +static inline void render_tri_type_2(ta_parameter_writer& writer, + vec3 ap, + vec3 bp, + vec3 cp, + float ai, + float bi, + float ci) +{ + writer.append() = + ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(false), + ap.x, ap.y, ap.z, + ai); + + writer.append() = + ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(false), + bp.x, bp.y, bp.z, + bi); + + writer.append() = + ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(true), + cp.x, cp.y, cp.z, + ci); +} + +static int type7_tri_count = 0; +static int vis_tri_count = 0; +static int total_tri_count = 0; + +static inline void render_tri_type_7(ta_parameter_writer& writer, + vec3 ap, + vec3 bp, + vec3 cp, + vec2 at, + vec2 bt, + vec2 ct, + float ai, + float bi, + float ci) +{ + type7_tri_count += 1; + + writer.append() = + ta_vertex_parameter::polygon_type_7(polygon_vertex_parameter_control_word(false), + ap.x, ap.y, ap.z, + at.x, at.y, + ai, + 0); + + writer.append() = + ta_vertex_parameter::polygon_type_7(polygon_vertex_parameter_control_word(false), + bp.x, bp.y, bp.z, + bt.x, bt.y, + bi, + 0); + + writer.append() = + ta_vertex_parameter::polygon_type_7(polygon_vertex_parameter_control_word(true), + cp.x, cp.y, cp.z, + ct.x, ct.y, + ci, + 0); +} + +static inline void render_clip_tri_type_7(ta_parameter_writer& writer, + vec3 ap, + vec3 bp, + vec3 cp, + vec2 at, + vec2 bt, + vec2 ct, + float li) +{ + //return; + const vec3 plane_point = {0.f, 0.f, 1.f}; + const vec3 plane_normal = {0.f, 0.f, 1.f}; + + vec3 preclip_position[] = {ap, bp, cp}; + vec2 preclip_texture[] = {at, bt, ct}; + + vec3 clip_position[4]; + vec2 clip_texture[4]; + int output_length = geometry::clip_polygon_uv<3>(clip_position, + clip_texture, + plane_point, + plane_normal, + preclip_position, + preclip_texture); + + { + vec3 ap; + vec3 bp; + vec3 cp; + vec3 dp; + + const vec2& at = clip_texture[0]; + const vec2& bt = clip_texture[1]; + const vec2& ct = clip_texture[2]; + const vec2& dt = clip_texture[3]; + if (output_length >= 3) { + ap = screen_transform(clip_position[0]); + bp = screen_transform(clip_position[1]); + cp = screen_transform(clip_position[2]); + + render_tri_type_7(writer, + ap, + bp, + cp, + at, + bt, + ct, + li, + li, + li); + } + if (output_length >= 4) { + dp = screen_transform(clip_position[3]); + + render_tri_type_7(writer, + ap, + cp, + dp, + at, + ct, + dt, + li, + li, + li); + } + } +} + +static inline float inverse_length(vec3 v) +{ + float f = dot(v, v); + return _fsrra(f); +} + +float light_intensity(vec3 light_vec, vec3 n) +{ + float n_dot_l = dot(n, light_vec); + + float intensity = 0.5f; + if (n_dot_l > 0) { + intensity += 0.7f * n_dot_l * (inverse_length(n) * inverse_length(light_vec)); + if (intensity > 1.0f) + intensity = 1.0f; + } + return intensity; +} + +static vec3 light_vec = {20, -20, -20}; + +static inline void transfer_face(ta_parameter_writer& writer, q3bsp_face_t * face, int * last_texture) +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + + q3bsp_direntry * ve = &header->direntries[LUMP_VERTEXES]; + q3bsp_vertex_t * vert = reinterpret_cast(&buf[ve->offset]); + + q3bsp_direntry * me = &header->direntries[LUMP_MESHVERTS]; + q3bsp_meshvert_t * meshvert = reinterpret_cast(&buf[me->offset]); + + int meshvert_ix = face->meshvert; + q3bsp_meshvert_t * mv = &meshvert[meshvert_ix]; + + int triangles = face->n_meshverts / 3; + + int textures_length = (sizeof (textures)) / (sizeof (textures[0])); + + bool has_texture = 1 && + (face->texture >= 0) && + (face->texture < textures_length) && + (textures[face->texture].size != 0); + + if (face->texture != *last_texture) { + *last_texture = face->texture; + if (has_texture) { + global_texture(writer, face->texture); + } else { + //global_polygon_type_1(writer, 0, 0, 0); + } + } + + for (int j = 0; j < triangles; j++) { + + int aix = mv[j * 3 + 0].offset + face->vertex; + int bix = mv[j * 3 + 1].offset + face->vertex; + int cix = mv[j * 3 + 2].offset + face->vertex; + + vec3 ap = vertex_cache[aix].position; + vec3 bp = vertex_cache[bix].position; + vec3 cp = vertex_cache[cix].position; + + vis_tri_count += 1; + + if (ap.z < 0 && bp.z < 0 && cp.z < 0) { + continue; + } + + vec3 n = vertex_cache[aix].normal; + float li = light_intensity(light_vec, n); + + + if (has_texture) { + float v_mul = textures[face->texture].v_mul; + vec2 at = {vert[aix].texcoord[0], vert[aix].texcoord[1] * v_mul}; + vec2 bt = {vert[bix].texcoord[0], vert[bix].texcoord[1] * v_mul}; + vec2 ct = {vert[cix].texcoord[0], vert[cix].texcoord[1] * v_mul}; + + if (ap.z < 0 || bp.z < 0 || cp.z < 0) { + render_clip_tri_type_7(writer, + ap, + bp, + cp, + at, + bt, + ct, + li); + + } else { + render_tri_type_7(writer, + screen_transform(ap), + screen_transform(bp), + screen_transform(cp), + at, + bt, + ct, + li, + li, + li); + } + } else { + if (ap.z < 0 || bp.z < 0 || cp.z < 0) { + continue; + } + render_tri_type_2(writer, + screen_transform(ap), + screen_transform(bp), + screen_transform(cp), + li, + li, + li); + } + } +} + +void transfer_faces(ta_parameter_writer& writer) +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + + q3bsp_direntry * fe = &header->direntries[LUMP_FACES]; + q3bsp_face_t * faces = reinterpret_cast(&buf[fe->offset]); + + int face_count = fe->length / (sizeof (struct q3bsp_face)); + + int last_texture = -1; + + for (int i = 0; i < face_count; i++) { + transfer_face(writer, &faces[i], &last_texture); + } +} + +int count_face_triangles() +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + + q3bsp_direntry * fe = &header->direntries[LUMP_FACES]; + q3bsp_face_t * faces = reinterpret_cast(&buf[fe->offset]); + + int face_count = fe->length / (sizeof (struct q3bsp_face)); + + int sum = 0; + + for (int i = 0; i < face_count; i++) { + int triangles = faces[i].n_meshverts / 3; + sum += triangles; + } + + return sum; +} + +void transfer_icosphere(ta_parameter_writer& writer, const mat4x4& screen_trans) +{ + const struct model * model = &icosphere_model; + const struct object * object = model->object[0]; + const vertex_position * position = model->position; + const vertex_normal * normal = model->normal; + + float s = 50; + mat4x4 scale = { + s, 0, 0, 0, + 0, -s, 0, 0, + 0, 0, s, 0, + 0, 0, 0, 1 + }; + + mat4x4 translate = { + 1, 0, 0, sphere_position.x, + 0, 1, 0, sphere_position.y, + 0, 0, 1, sphere_position.z, + 0, 0, 0, 1 + }; + + mat4x4 trans = screen_trans * translate * scale; + + float a = 1.0f; + float r = 0.9f; + float g = 0.5f; + float b = 0.0f; + global_polygon_type_1(writer, 0, 0, 0, a, r, g, b); + + for (int i = 0; i < object->triangle_count; i++) { + const union triangle * tri = &object->triangle[i]; + vec3 ap = trans * position[tri->v[0].position]; + vec3 bp = trans * position[tri->v[1].position]; + vec3 cp = trans * position[tri->v[2].position]; + + if (ap.z < 0 || bp.z < 0 || cp.z < 0) return; + + vec3 n = normal_transform(trans, normal[tri->v[0].normal]); + float li = light_intensity(light_vec, n); + + render_tri_type_2(writer, + screen_transform(ap), + screen_transform(bp), + screen_transform(cp), + li, + li, + li); + } +} + +static inline void render_quad(ta_parameter_writer& writer, + vec3 ap, + vec3 bp, + vec3 cp, + vec3 dp, + uint32_t base_color) +{ + if (ap.z < 0 || bp.z < 0 || cp.z < 0 || dp.z < 0) + return; + + writer.append() = + ta_vertex_parameter::polygon_type_0(polygon_vertex_parameter_control_word(false), + ap.x, ap.y, ap.z, + base_color); + + writer.append() = + ta_vertex_parameter::polygon_type_0(polygon_vertex_parameter_control_word(false), + bp.x, bp.y, bp.z, + base_color); + + writer.append() = + ta_vertex_parameter::polygon_type_0(polygon_vertex_parameter_control_word(false), + dp.x, dp.y, dp.z, + base_color); + + writer.append() = + ta_vertex_parameter::polygon_type_0(polygon_vertex_parameter_control_word(true), + cp.x, cp.y, cp.z, + base_color); +} + +void render_bounding_box(ta_parameter_writer& writer, const mat4x4& trans, vec3 max, vec3 min, uint32_t color) +{ + vec3 a = max; + vec3 b = min; + + global_polygon_type_0(writer); + + // ax + render_quad(writer, + screen_transform(trans * (vec3){a.x, a.y, a.z}), + screen_transform(trans * (vec3){a.x, b.y, a.z}), + screen_transform(trans * (vec3){a.x, b.y, b.z}), + screen_transform(trans * (vec3){a.x, a.y, b.z}), + color); + + // bx + render_quad(writer, + screen_transform(trans * (vec3){b.x, a.y, a.z}), + screen_transform(trans * (vec3){b.x, b.y, a.z}), + screen_transform(trans * (vec3){b.x, b.y, b.z}), + screen_transform(trans * (vec3){b.x, a.y, b.z}), + color); + + // ay + render_quad(writer, + screen_transform(trans * (vec3){b.x, a.y, a.z}), + screen_transform(trans * (vec3){a.x, a.y, a.z}), + screen_transform(trans * (vec3){a.x, a.y, b.z}), + screen_transform(trans * (vec3){b.x, a.y, b.z}), + color); + + // by + render_quad(writer, + screen_transform(trans * (vec3){b.x, b.y, a.z}), + screen_transform(trans * (vec3){a.x, b.y, a.z}), + screen_transform(trans * (vec3){a.x, b.y, b.z}), + screen_transform(trans * (vec3){b.x, b.y, b.z}), + color); + + // az + render_quad(writer, + screen_transform(trans * (vec3){b.x, a.y, a.z}), + screen_transform(trans * (vec3){b.x, b.y, a.z}), + screen_transform(trans * (vec3){a.x, b.y, a.z}), + screen_transform(trans * (vec3){a.x, a.y, a.z}), + color); + + // bz + render_quad(writer, + screen_transform(trans * (vec3){b.x, a.y, b.z}), + screen_transform(trans * (vec3){b.x, b.y, b.z}), + screen_transform(trans * (vec3){a.x, b.y, b.z}), + screen_transform(trans * (vec3){a.x, a.y, b.z}), + color); +} + +int format_float(char * s, float num, int pad_length) +{ + int offset = 0; + bool negative = num < 0; + if (negative) num = -num; + int32_t whole = num; + int digits = digits_base10(whole); + offset += unparse_base10_unsigned(&s[offset], whole, pad_length, ' '); + if (negative) + s[offset - (digits + 1)] = '-'; + s[offset++] = '.'; + int32_t fraction = (int32_t)((num - (float)whole) * 1000.0); + if (fraction < 0) + fraction = -fraction; + offset += unparse_base10_unsigned(&s[offset], fraction, 3, '0'); + return offset; +} + +void render_matrix(ta_parameter_writer& writer, const mat4x4& trans) +{ + for (int row = 0; row < 4; row++) { + char __attribute__((aligned(4))) s[64]; + for (uint32_t i = 0; i < (sizeof (s)) / 4; i++) + reinterpret_cast(s)[i] = 0x20202020; + + int offset = 0; + offset += format_float(&s[offset], trans[row][0], 7); + offset += format_float(&s[offset], trans[row][1], 7); + offset += format_float(&s[offset], trans[row][2], 7); + offset += format_float(&s[offset], trans[row][3], 7); + + font_bitmap::transform_string(writer, + 8, 16, // texture + 8, 16, // glyph + 16 + 2 * 8, // position x + 16 + row * 16, // position y + s, offset, + para_control::list_type::opaque); + } +} + +void render_sphere_position(ta_parameter_writer& writer) +{ + char __attribute__((aligned(4))) s[64] = "pos: "; + for (uint32_t i = 2; i < ((sizeof (s)) - 8) / 4; i++) + reinterpret_cast(s)[i] = 0x20202020; + + int offset = 8; + int row = 5; + offset += format_float(&s[offset], sphere_position[0], 7); + offset += format_float(&s[offset], sphere_position[1], 7); + offset += format_float(&s[offset], sphere_position[2], 7); + + font_bitmap::transform_string(writer, + 8, 16, // texture + 8, 16, // glyph + 16 + 2 * 8, // position x + 16 + row * 16, // position y + s, offset, + para_control::list_type::opaque); +} + +void render_zero_position(ta_parameter_writer& writer, const mat4x4& screen_trans_inv) +{ + char __attribute__((aligned(4))) s[64] = "zero: "; + for (uint32_t i = 2; i < ((sizeof (s)) - 8) / 4; i++) + reinterpret_cast(s)[i] = 0x20202020; + + vec3 zero = {0, 0, 0}; + vec3 pos = screen_trans_inv * zero; + + int offset = 8; + int row = 6; + offset += format_float(&s[offset], pos[0], 7); + offset += format_float(&s[offset], pos[1], 7); + offset += format_float(&s[offset], pos[2], 7); + + font_bitmap::transform_string(writer, + 8, 16, // texture + 8, 16, // glyph + 16 + 2 * 8, // position x + 16 + row * 16, // position y + s, offset, + para_control::list_type::opaque); +} + +static int root_ix = 0; + +void render_ix(ta_parameter_writer& writer, int row, char * s, int ix) +{ + int offset = 15; + bool is_leaf = ix < 0; + if (ix < 0) + ix = -(ix - 1); + + offset += unparse_base10_unsigned(&s[offset], ix, 5, ' '); + + if (is_leaf) { + s[offset++] = ' '; + s[offset++] = '('; + s[offset++] = 'l'; + s[offset++] = 'e'; + s[offset++] = 'a'; + s[offset++] = 'f'; + s[offset++] = ')'; + } else { + s[offset++] = ' '; + s[offset++] = '('; + s[offset++] = 'n'; + s[offset++] = 'o'; + s[offset++] = 'd'; + s[offset++] = 'e'; + s[offset++] = ')'; + } + + font_bitmap::transform_string(writer, + 8, 16, // texture + 8, 16, // glyph + 16 + 50 * 8, // position x + 16 + row * 16, // position y + s, offset, + para_control::list_type::opaque); +} + +void render_leaf_ix(ta_parameter_writer& writer) +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + q3bsp_direntry * ne = &header->direntries[LUMP_NODES]; + q3bsp_node_t * nodes = reinterpret_cast(&buf[ne->offset]); + q3bsp_node_t * root = &nodes[root_ix]; + + { + char s[32] = "root: "; + int row = 0; + render_ix(writer, row, s, root_ix); + } + + { + char s[32] = "root.child[0]: "; + int row = 1; + render_ix(writer, row, s, root->children[0]); + } + + { + char s[32] = "root.child[1]: "; + int row = 2; + render_ix(writer, row, s, root->children[1]); + } +} + +void render_num(ta_parameter_writer& writer, int row, char * s, int num, int offset) +{ + offset += unparse_base10_unsigned(&s[offset], num, 5, ' '); + + font_bitmap::transform_string(writer, + 8, 16, // texture + 8, 16, // glyph + 16 + 50 * 8, // position x + 16 + row * 16, // position y + s, offset, + para_control::list_type::opaque); +} + +void render_tris_count(ta_parameter_writer& writer) +{ + int offset = 18; + { + char s[32] = "total tris: "; + int row = 0; + render_num(writer, row, s, total_tri_count, offset); + } + { + char s[32] = "bsp-visible tris: "; + int row = 1; + render_num(writer, row, s, vis_tri_count, offset); + } + { + char s[32] = "rendered tris: "; + int row = 2; + render_num(writer, row, s, type7_tri_count, offset); + } +} + +void render_bounding_box_mm(ta_parameter_writer& writer, const mat4x4& trans, int mins[3], int maxs[3], uint32_t color) +{ + vec3 max = {(float)maxs[0], (float)maxs[1], (float)maxs[2]}; + vec3 min = {(float)mins[0], (float)mins[1], (float)mins[2]}; + render_bounding_box(writer, trans, max, min, color); +} + +void render_bounding_boxes(ta_parameter_writer& writer, const mat4x4& trans) +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + + q3bsp_direntry * le = &header->direntries[LUMP_LEAFS]; + q3bsp_leaf_t * leafs = reinterpret_cast(&buf[le->offset]); + + q3bsp_direntry * ne = &header->direntries[LUMP_NODES]; + q3bsp_node_t * nodes = reinterpret_cast(&buf[ne->offset]); + q3bsp_node_t * root = &nodes[root_ix]; + + { + if (root->children[0] >= 0) { + q3bsp_node_t * a = &nodes[root->children[0]]; + uint32_t color = 0x80ff00e6; + render_bounding_box_mm(writer, trans, a->mins, a->maxs, color); + } else { + int leaf_ix = -(root->children[0] + 1); + q3bsp_leaf_t * leaf = &leafs[leaf_ix]; + uint32_t color = 0x80ff0016; + render_bounding_box_mm(writer, trans, leaf->maxs, leaf->mins, color); + } + + if (root->children[1] >= 0) { + q3bsp_node_t * b = &nodes[root->children[1]]; + uint32_t color = 0x8000ffe6; + render_bounding_box_mm(writer, trans, b->mins, b->maxs, color); + } else { + int leaf_ix = -(root->children[1] + 1); + q3bsp_leaf_t * leaf = &leafs[leaf_ix]; + uint32_t color = 0x8000ff16; + render_bounding_box_mm(writer, trans, leaf->maxs, leaf->mins, color); + } + } +} + +bool vec3_in_bb(vec3 v, int mins[3], int maxs[3]) +{ + return + v.x >= mins[0] && + v.y >= mins[1] && + v.z >= mins[2] && + v.x <= maxs[0] && + v.y <= maxs[1] && + v.z <= maxs[2]; +} + +void render_leaf_faces(ta_parameter_writer& writer, const mat4x4& trans, q3bsp_leaf_t * leaf) +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + + //int leafface First leafface for leaf. + //int n_leaffaces Number of leaffaces for leaf. + + q3bsp_direntry * fe = &header->direntries[LUMP_FACES]; + q3bsp_face_t * faces = reinterpret_cast(&buf[fe->offset]); + + q3bsp_direntry * lef = &header->direntries[LUMP_LEAFFACES]; + q3bsp_leafface_t * leaffaces = reinterpret_cast(&buf[lef->offset]); + + q3bsp_leafface_t * lf = &leaffaces[leaf->leafface]; + + int last_texture = -1; + + for (int i = 0; i < leaf->n_leaffaces; i++) { + int face_ix = lf[i].face; + if (face_cache[face_ix] != 0) + continue; + face_cache[face_ix] = 1; + transfer_face(writer, &faces[face_ix], &last_texture); + } +} + +void render_visible_faces(ta_parameter_writer& writer, const mat4x4& trans, const vec3 pos) +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + + q3bsp_direntry * le = &header->direntries[LUMP_LEAFS]; + q3bsp_leaf_t * leafs = reinterpret_cast(&buf[le->offset]); + + q3bsp_direntry * ne = &header->direntries[LUMP_NODES]; + q3bsp_node_t * nodes = reinterpret_cast(&buf[ne->offset]); + q3bsp_node_t * root = &nodes[0]; + + q3bsp_direntry * ve = &header->direntries[LUMP_VISDATA]; + q3bsp_visdata_t * visdata = reinterpret_cast(&buf[ve->offset]); + + q3bsp_leaf_t * bb_leaf = NULL; + + bool all_visible = false; + + while (true) { + bool a_inside; + bool b_inside; + q3bsp_node_t * new_root = NULL; + if (root->children[0] >= 0) { + q3bsp_node_t * node = &nodes[root->children[0]]; + a_inside = vec3_in_bb(pos, node->mins, node->maxs); + if (a_inside) { + new_root = node; + } + } else { + int leaf_ix = -(root->children[0] + 1); + q3bsp_leaf_t * leaf = &leafs[leaf_ix]; + a_inside = vec3_in_bb(pos, leaf->mins, leaf->maxs); + if (a_inside) { + bb_leaf = leaf; + break; + } + } + if (root->children[1] >= 0) { + q3bsp_node_t * node = &nodes[root->children[1]]; + b_inside = vec3_in_bb(pos, node->mins, node->maxs); + if (b_inside) { + new_root = node; + } + } else { + int leaf_ix = -(root->children[1] + 1); + q3bsp_leaf_t * leaf = &leafs[leaf_ix]; + b_inside = vec3_in_bb(pos, leaf->mins, leaf->maxs); + if (b_inside) { + bb_leaf = leaf; + break; + } + } + + /* + if (!(a_inside ^ b_inside)) { + printf("root_ix %d\n", root - nodes); + } + */ + + //assert(a_inside || b_inside); + if (!(a_inside || b_inside)) { + all_visible = true; + break; + } + //assert(new_root != NULL); + root = new_root; + } + + + if (!all_visible) { + assert(bb_leaf != NULL); + //uint32_t color = 0x8000ff16; + //render_bounding_box_mm(writer, trans, bb_leaf->maxs, bb_leaf->mins, color); + render_leaf_faces(writer, trans, bb_leaf); + } + + int leaf_count = le->length / (sizeof (struct q3bsp_leaf)); + for (int i = 0; i < leaf_count; i++) { + q3bsp_leaf_t * leaf = &leafs[i]; + + // Cluster x is visible from cluster y if the (1 << y % 8) bit of vecs[x * sz_vecs + y / 8] is set. + /* + if (leaf->mins[2] > 450 && leaf->maxs[2] > 450) + continue; + */ + + int y = bb_leaf->cluster; + int x = leaf->cluster; + bool visible = (visdata->vecs[x * visdata->sz_vecs + y / 8] & (1 << (y % 8))) != 0; + if (all_visible || visible) { + //uint32_t color = 0x40ff00e6; + //render_bounding_box_mm(writer, trans, leaf->maxs, leaf->mins, color); + render_leaf_faces(writer, trans, leaf); + } + } +} + +void transfer_scene(ta_parameter_writer& writer, const mat4x4& screen_trans, const mat4x4& screen_trans_inv) +{ + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + + const mat4x4 trans = screen_trans; + + q3bsp_direntry * ve = &header->direntries[LUMP_VERTEXES]; + transform_vertices(&buf[ve->offset], ve->length, trans); + + q3bsp_direntry * fe = &header->direntries[LUMP_FACES]; + int face_count = fe->length / (sizeof (struct q3bsp_face)); + + //transfer_faces(writer); + transfer_icosphere(writer, trans); + + render_matrix(writer, screen_trans); + //render_leaf_ix(writer); + render_sphere_position(writer); + //render_zero_position(writer, screen_trans_inv); + + vec3 pos = screen_trans_inv * (vec3){0, 0, 0}; + type7_tri_count = 0; + vis_tri_count = 0; + for (int i = 0; i < face_count; i++) face_cache[i] = 0; + render_visible_faces(writer, trans, pos); + render_tris_count(writer); + + writer.append() = + ta_global_parameter::end_of_list(para_control::para_type::end_of_list); + + global_polygon_type_0(writer); + render_quad(writer, + {0, 0, 0}, + {0, 0, 0}, + {0, 0, 0}, + {0, 0, 0}, + 0); + + root_ix = 1552; + //render_bounding_boxes(writer, trans); + + writer.append() = + ta_global_parameter::end_of_list(para_control::para_type::end_of_list); +} + +static uint8_t __attribute__((aligned(32))) ta_parameter_buf[1024 * 1024 * 2] = {}; + +constexpr inline mat4x4 rotate_x(float t) +{ + mat4x4 r = { + 1, 0, 0, 0, + 0, cos(t), -sin(t), 0, + 0, sin(t), cos(t), 0, + 0, 0, 0, 1, + }; + return r; +} + +constexpr inline mat4x4 rotate_y(float t) +{ + mat4x4 r = { + cos(t), 0, sin(t), 0, + 0, 1, 0, 0, + -sin(t), 0, cos(t), 0, + 0, 0, 0, 1, + }; + return r; +} + +constexpr inline mat4x4 rotate_z(float t) +{ + mat4x4 r = { + cos(t), -sin(t), 0, 0, + sin(t), cos(t), 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1, + }; + return r; +} + +void transfer_ta_fifo_texture_memory_32byte(void * dst, void * src, int length) +{ + uint32_t out_addr = (uint32_t)dst; + sh7091.CCN.QACR0 = ((reinterpret_cast(out_addr) >> 24) & 0b11100); + sh7091.CCN.QACR1 = ((reinterpret_cast(out_addr) >> 24) & 0b11100); + + volatile uint32_t * base = &store_queue[(out_addr & 0x03ffffc0) / 4]; + uint32_t * src32 = reinterpret_cast(src); + + length = (length + 31) & ~31; // round up to nearest multiple of 32 + while (length > 0) { + base[0] = src32[0]; + base[1] = src32[1]; + base[2] = src32[2]; + base[3] = src32[3]; + base[4] = src32[4]; + base[5] = src32[5]; + base[6] = src32[6]; + base[7] = src32[7]; + asm volatile ("pref @%0" + : // output + : "r" (&base[0]) // input + : "memory"); + length -= 32; + base += 8; + src32 += 8; + } +} + +void transfer_textures() +{ + system.LMMODE0 = 0; // 64-bit address space + system.LMMODE1 = 0; // 64-bit address space + + int textures_length = (sizeof (textures)) / (sizeof (textures[0])); + for (int i = 0; i < textures_length; i++) { + uint32_t offset = texture_memory_alloc.texture.start + font_offset + textures[i].offset; + void * dst = reinterpret_cast(&ta_fifo_texture_memory[offset / 4]); + void * src = textures[i].start; + uint32_t size = textures[i].size; + transfer_ta_fifo_texture_memory_32byte(dst, src, size); + } +} + +static bool push = false; + +mat4x4 update_analog(const mat4x4& screen) +{ + const float x_ = static_cast(data[0].analog_coordinate_axis[2] - 0x80) / 127.f; + const float y_ = static_cast(data[0].analog_coordinate_axis[3] - 0x80) / 127.f; + + int ra = ft0::data_transfer::digital_button::ra(data[0].digital_button) == 0; + int la = ft0::data_transfer::digital_button::la(data[0].digital_button) == 0; + int da = ft0::data_transfer::digital_button::da(data[0].digital_button) == 0; + int ua = ft0::data_transfer::digital_button::ua(data[0].digital_button) == 0; + + int db_a = ft0::data_transfer::digital_button::a(data[0].digital_button) == 0; + int db_b = ft0::data_transfer::digital_button::b(data[0].digital_button) == 0; + int db_x = ft0::data_transfer::digital_button::x(data[0].digital_button) == 0; + int db_y = ft0::data_transfer::digital_button::y(data[0].digital_button) == 0; + + float x = 0; + if (ra && !la) x = -10; + if (la && !ra) x = 10; + + float y = -7 * y_; + + float z = 0; + if (ua && !da) z = -10; + if (da && !ua) z = 10; + + mat4x4 t = { + 1, 0, 0, x, + 0, 1, 0, y, + 0, 0, 1, z, + 0, 0, 0, 1, + }; + + float yt = 0.05f * x_; + float xt = 0.05f * y_; + + /* + mat4x4 rx = { + 1, 0, 0, 0, + 0, cos(xt), -sin(xt), 0, + 0, sin(xt), cos(xt), 0, + 0, 0, 0, 1, + }; + */ + + mat4x4 ry = { + cos(yt), 0, sin(yt), 0, + 0, 1, 0, 0, + -sin(yt), 0, cos(yt), 0, + 0, 0, 0, 1, + }; + + uint8_t * buf = reinterpret_cast(&_binary_bsp_katdm3_maps_katdm3_bsp_start); + q3bsp_header_t * header = reinterpret_cast(buf); + //q3bsp_direntry * le = &header->direntries[LUMP_LEAFS]; + //int num_leaves = le->length / (sizeof (struct q3bsp_leaf)); + q3bsp_direntry * ne = &header->direntries[LUMP_NODES]; + q3bsp_node_t * nodes = reinterpret_cast(&buf[ne->offset]); + + if (0) { + if (db_x && !db_y && !push) { + push = true; + //leaf_ix -= 1; + //if (leaf_ix < 0) leaf_ix = num_leaves - 1; + + int ix = nodes[root_ix].children[0]; + if (ix >= 0) + root_ix = ix; + } + if (db_y && !db_x && !push) { + push = true; + //leaf_ix += 1; + //if (leaf_ix > num_leaves) leaf_ix = 0; + int ix = nodes[root_ix].children[1]; + if (ix >= 0) + root_ix = ix; + } + if (!db_x && !db_y) { + push = false; + } + } else { + if (db_x && !db_b) { + sphere_position.x -= 10; + } + if (db_b && !db_x) { + sphere_position.x += 10; + } + if (db_y && !db_a) { + sphere_position.y += 10; + } + if (db_a && !db_y) { + sphere_position.y -= 10; + } + } + + return ry * t * screen; +} + +void transfer_font() +{ + const uint8_t * src = reinterpret_cast(&_binary_font_verite_8x16_verite_8x16_data_start); + uint32_t offset = font_bitmap::inflate(1, // pitch + 8, // width + 16, // height + 8, // texture_width + 16, // texture_height + src); + printf("font_offset %d actual %d\n", font_offset, offset); +} + +int main() +{ + serial::init(0); + + total_tri_count = count_face_triangles(); + + interrupt_init(); + transfer_textures(); + transfer_font(); + palette_data<3>(); + do_device_request(); + + constexpr uint32_t ta_alloc = 0 + | ta_alloc_ctrl::pt_opb::no_list + | ta_alloc_ctrl::tm_opb::no_list + | ta_alloc_ctrl::t_opb::_16x4byte + | ta_alloc_ctrl::om_opb::no_list + | ta_alloc_ctrl::o_opb::_16x4byte; + + constexpr int ta_cont_count = 1; + constexpr struct opb_size opb_size[ta_cont_count] = { + { + .opaque = 16 * 4, + .opaque_modifier = 0, + .translucent = 16 * 4, + .translucent_modifier = 0, + .punch_through = 0 + } + }; + + holly.SOFTRESET = softreset::pipeline_soft_reset + | softreset::ta_soft_reset; + holly.SOFTRESET = 0; + + core_init(); + + system.IML6NRM = istnrm::end_of_render_tsp; + + const int framebuffer_width = 640; + const int framebuffer_height = 480; + const int tile_width = framebuffer_width / 32; + const int tile_height = framebuffer_height / 32; + + for (int i = 0; i < 2; i++) { + region_array_multipass(tile_width, + tile_height, + opb_size, + ta_cont_count, + texture_memory_alloc.region_array[i].start, + texture_memory_alloc.object_list[i].start); + + background_parameter2(texture_memory_alloc.background[i].start, + 0xff202040); + } + + ta_parameter_writer writer = ta_parameter_writer(ta_parameter_buf, (sizeof (ta_parameter_buf))); + + video_output::set_mode_vga(); + + int ta = 0; + int core = 0; + + /* + mat4x4 trans = { + 1.0, 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 1000.0, + 0.0, 0.0, 0.0, 1.0, + }; + */ + + mat4x4 trans = { + 1.0, 0.0, 0.0, -1611.0, + 0.0, 0.0, -1.0, 111.0, + 0.0, 1.0, 0.0, 1185.0, + 0.0, 0.0, 0.0, 1.0, + }; + + do_get_condition(); + + while (1) { + //maple::dma_wait_complete(); + do_get_condition(); + + trans = update_analog(trans); + + mat4x4 trans_inv = inverse(trans); + + ta_polygon_converter_init2(texture_memory_alloc.isp_tsp_parameters[ta].start, + texture_memory_alloc.isp_tsp_parameters[ta].end, + texture_memory_alloc.object_list[ta].start, + texture_memory_alloc.object_list[ta].end, + opb_size[0].total(), + ta_alloc, + tile_width, + tile_height); + + writer.offset = 0; + transfer_scene(writer, trans, trans_inv); + ta_polygon_converter_writeback(writer.buf, writer.offset); + ta_polygon_converter_transfer(writer.buf, writer.offset); + ta_wait_translucent_list(); + //ta_wait_opaque_list(); + + render_done = 0; + core_start_render2(texture_memory_alloc.region_array[core].start, + texture_memory_alloc.isp_tsp_parameters[core].start, + texture_memory_alloc.background[core].start, + texture_memory_alloc.framebuffer[core].start, + framebuffer_width); + while (render_done == 0) { + asm volatile ("nop"); + }; + + while (spg_status::vsync(holly.SPG_STATUS)); + while (!spg_status::vsync(holly.SPG_STATUS)); + holly.FB_R_SOF1 = texture_memory_alloc.framebuffer[ta].start; + } +} diff --git a/holly/ta_parameter.hpp b/holly/ta_parameter.hpp index e7a6140..9f2c20b 100644 --- a/holly/ta_parameter.hpp +++ b/holly/ta_parameter.hpp @@ -2,6 +2,7 @@ #include #include +#include "assert.h" #include "../float_uint32.hpp" @@ -83,11 +84,12 @@ constexpr uint32_t modifier_volume_vertex_parameter_control_word() struct ta_parameter_writer { uint8_t * buf; + uint32_t length; uint32_t offset; // in bytes template - ta_parameter_writer(T * buf) - : buf(reinterpret_cast(buf)), offset(0) + ta_parameter_writer(T * buf, uint32_t length) + : buf(reinterpret_cast(buf)), length(length), offset(0) { } template @@ -95,6 +97,7 @@ struct ta_parameter_writer { { T& t = *reinterpret_cast(&buf[offset]); offset += (sizeof (T)); + assert(offset < length); return t; } };