bilbo/dreamcast
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: bilbo:1f80d210845f5d30ff14a98331d4fe513bd57305
Branches Tags
bilbo:main
bilbo:long-samples
..
compare: bilbo:d2d085e29bc2355171de4dff19ded5d74ed46e91
Branches Tags
bilbo:main
bilbo:long-samples

3 Commits
1f80d21084 ... d2d085e29b

Author SHA1 Message Date
Zack Buhman
d2d085e29b 20kdm2: with two volumes 2025-04-26 09:52:44 -05:00
Zack Buhman
aa08771e55 20kdm2: add bsp_start constant 2025-04-26 05:14:08 -05:00
Zack Buhman
d2e5558225 q3bsp/debug: add lightmap debug 2025-04-26 05:12:38 -05:00
5 changed files with 394 additions and 164 deletions
Show Stats Expand all files Collapse all files

467
example/bsp/20kdm2.cpp
View File

@ -76,7 +76,7 @@
#include "assert.h" #include "assert.h"
constexpr int font_offset = ((0x7f - 0x20) + 1) * 8 * 16 / 2; constexpr int font_base = ((0x7f - 0x20) + 1) * 8 * 16 / 2;
using vec2 = vec<2, float>; using vec2 = vec<2, float>;
using vec3 = vec<3, float>; using vec3 = vec<3, float>;
@ -94,6 +94,8 @@ uint8_t recv_buf[1024] __attribute__((aligned(32)));
constexpr void * bsp_start = &_binary_bsp_20kdm2_maps_20kdm2_bsp_start; constexpr void * bsp_start = &_binary_bsp_20kdm2_maps_20kdm2_bsp_start;
uint32_t lightmap_base = 0;
void do_get_condition() void do_get_condition()
{ {
auto writer = maple::host_command_writer(send_buf, recv_buf); auto writer = maple::host_command_writer(send_buf, recv_buf);
@ -158,7 +160,7 @@ static inline vec3 screen_transform(vec3 v)
void global_polygon_type_0(ta_parameter_writer& writer) void global_polygon_type_0(ta_parameter_writer& writer)
{ {
const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume
| para_control::list_type::translucent | para_control::list_type::opaque
| obj_control::col_type::packed_color | obj_control::col_type::packed_color
; ;
@ -183,40 +185,6 @@ void global_polygon_type_0(ta_parameter_writer& writer)
); );
} }
void global_polygon_type_0_textured(ta_parameter_writer& writer,
uint32_t obj_control_texture,
uint32_t texture_u_v_size,
uint32_t texture_control_word
)
{
const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume
| para_control::list_type::opaque
| obj_control::col_type::floating_color
| 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_0>() =
ta_global_parameter::polygon_type_0(parameter_control_word,
isp_tsp_instruction_word,
tsp_instruction_word,
texture_control_word,
0,
0);
}
void global_polygon_type_1(ta_parameter_writer& writer, void global_polygon_type_1(ta_parameter_writer& writer,
uint32_t obj_control_texture, uint32_t obj_control_texture,
uint32_t texture_u_v_size, uint32_t texture_u_v_size,
@ -239,8 +207,6 @@ void global_polygon_type_1(ta_parameter_writer& writer,
; ;
const uint32_t tsp_instruction_word = tsp_instruction_word::fog_control::no_fog 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::filter_mode::bilinear_filter
| tsp_instruction_word::texture_shading_instruction::modulate | tsp_instruction_word::texture_shading_instruction::modulate
| texture_u_v_size | texture_u_v_size
@ -258,24 +224,142 @@ void global_polygon_type_1(ta_parameter_writer& writer,
); );
} }
void global_polygon_type_4(ta_parameter_writer& writer,
uint32_t obj_control_texture,
uint32_t tsp_instruction_word_0,
uint32_t texture_control_word_0,
uint32_t tsp_instruction_word_1,
uint32_t texture_control_word_1,
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::punch_through
| obj_control::col_type::intensity_mode_1
| obj_control::gouraud
| obj_control::shadow
| obj_control::volume::polygon::with_two_volumes
| 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::filter_mode::point_sampled
| tsp_instruction_word::texture_shading_instruction::decal
;
writer.append<ta_global_parameter::polygon_type_4>() =
ta_global_parameter::polygon_type_4(parameter_control_word,
isp_tsp_instruction_word,
tsp_instruction_word_0 | tsp_instruction_word,
texture_control_word_0,
tsp_instruction_word_1 | tsp_instruction_word,
texture_control_word_1,
0, // data_size_for_sort_dma
0, // next_address_for_sort_dma
a, // face_color_alpha_0
r, // face_color_r_0
g, // face_color_g_0
b, // face_color_b_0
a, // face_color_alpha_1
r, // face_color_r_1
g, // face_color_g_1
b // face_color_b_1
);
}
void global_texture(ta_parameter_writer& writer, int ix) void global_texture(ta_parameter_writer& writer, int ix)
{ {
struct pk_texture * texture = &textures[ix]; struct pk_texture * texture = &textures[ix];
uint32_t texture_u_v_size = tsp_instruction_word::texture_u_size::from_int(texture->width) uint32_t texture_u_v_size = tsp_instruction_word::src_alpha_instr::one
| tsp_instruction_word::dst_alpha_instr::zero
| tsp_instruction_word::texture_u_size::from_int(texture->width)
| tsp_instruction_word::texture_v_size::from_int(texture->height) | 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_address = texture_memory_alloc.texture.start + font_base + lightmap_base + texture->offset;
uint32_t texture_control_word = texture_control_word::pixel_format::_565 uint32_t texture_control_word = texture_control_word::pixel_format::_565
| texture_control_word::scan_order::twiddled | texture_control_word::scan_order::twiddled
| texture_control_word::texture_address(texture_address / 8) | texture_control_word::texture_address(texture_address / 8)
; ;
global_polygon_type_0_textured(writer, global_polygon_type_1(writer,
obj_control::texture, obj_control::texture,
texture_u_v_size, texture_u_v_size,
texture_control_word); texture_control_word);
}
void global_lightmap(ta_parameter_writer& writer, int lightmap_ix)
{
uint32_t texture_u_v_size = tsp_instruction_word::src_alpha_instr::one
| tsp_instruction_word::dst_alpha_instr::zero
| tsp_instruction_word::texture_u_size::from_int(128)
| tsp_instruction_word::texture_v_size::from_int(128)
;
uint32_t texture_address = texture_memory_alloc.texture.start + font_base + 128 * 128 * 2 * lightmap_ix;
uint32_t texture_control_word = texture_control_word::pixel_format::_565
| texture_control_word::scan_order::non_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 global_texture_lightmap(ta_parameter_writer& writer, int texture_ix, int lightmap_ix)
{
pk_texture * texture = &textures[texture_ix];
int texture_offset = texture->offset;
int lightmap_offset = 128 * 128 * 2 * lightmap_ix;
uint32_t tsp_instruction_word_0 = tsp_instruction_word::src_alpha_instr::one
| tsp_instruction_word::dst_alpha_instr::zero
| tsp_instruction_word::texture_u_size::from_int(texture->width)
| tsp_instruction_word::texture_v_size::from_int(texture->height)
;
uint32_t texture_address_0 = texture_memory_alloc.texture.start + font_base + lightmap_base + texture_offset;
uint32_t texture_control_word_0 = texture_control_word::pixel_format::_565
| texture_control_word::scan_order::twiddled
| texture_control_word::texture_address(texture_address_0 / 8)
;
uint32_t tsp_instruction_word_1;
if (lightmap_offset >= 0) {
tsp_instruction_word_1 = tsp_instruction_word::src_alpha_instr::other_color
| tsp_instruction_word::dst_alpha_instr::zero
| tsp_instruction_word::texture_u_size::from_int(128)
| tsp_instruction_word::texture_v_size::from_int(128)
;
} else {
tsp_instruction_word_1 = tsp_instruction_word::src_alpha_instr::zero
| tsp_instruction_word::dst_alpha_instr::one
| tsp_instruction_word::texture_u_size::from_int(128)
| tsp_instruction_word::texture_v_size::from_int(128)
;
}
uint32_t texture_address_1 = texture_memory_alloc.texture.start + font_base + lightmap_offset;
uint32_t texture_control_word_1 = texture_control_word::pixel_format::_565
| texture_control_word::scan_order::non_twiddled
| texture_control_word::texture_address(texture_address_1 / 8)
;
global_polygon_type_4(writer,
obj_control::texture,
tsp_instruction_word_0,
texture_control_word_0,
tsp_instruction_word_1,
texture_control_word_1);
} }
void transform_vertices(uint8_t * buf, int length, const mat4x4& trans) void transform_vertices(uint8_t * buf, int length, const mat4x4& trans)
@ -299,75 +383,118 @@ static inline void render_tri_type_2(ta_parameter_writer& writer,
vec3 ap, vec3 ap,
vec3 bp, vec3 bp,
vec3 cp, vec3 cp,
float ai, float li)
float bi,
float ci)
{ {
writer.append<ta_vertex_parameter::polygon_type_2>() = writer.append<ta_vertex_parameter::polygon_type_2>() =
ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(false), ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(false),
ap.x, ap.y, ap.z, ap.x, ap.y, ap.z,
ai); li);
writer.append<ta_vertex_parameter::polygon_type_2>() = writer.append<ta_vertex_parameter::polygon_type_2>() =
ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(false), ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(false),
bp.x, bp.y, bp.z, bp.x, bp.y, bp.z,
bi); li);
writer.append<ta_vertex_parameter::polygon_type_2>() = writer.append<ta_vertex_parameter::polygon_type_2>() =
ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(true), ta_vertex_parameter::polygon_type_2(polygon_vertex_parameter_control_word(true),
cp.x, cp.y, cp.z, cp.x, cp.y, cp.z,
ci); li);
} }
static int type5_tri_count = 0; static int typen_tri_count = 0;
static int vis_tri_count = 0; static int vis_tri_count = 0;
static int total_tri_count = 0; static int total_tri_count = 0;
static inline void render_tri_type_5(ta_parameter_writer& writer, static inline void render_tri_type_7(ta_parameter_writer& writer,
vec3 ap, vec3 ap,
vec3 bp, vec3 bp,
vec3 cp, vec3 cp,
vec2 at, vec2 at,
vec2 bt, vec2 bt,
vec2 ct, vec2 ct,
vec3 ac, float li)
vec3 bc,
vec3 cc)
{ {
type5_tri_count += 1; typen_tri_count += 1;
writer.append<ta_vertex_parameter::polygon_type_5>() = writer.append<ta_vertex_parameter::polygon_type_7>() =
ta_vertex_parameter::polygon_type_5(polygon_vertex_parameter_control_word(false), ta_vertex_parameter::polygon_type_7(polygon_vertex_parameter_control_word(false),
ap.x, ap.y, ap.z, ap.x, ap.y, ap.z,
at.x, at.y, at.x, at.y,
1.0, ac.x, ac.y, ac.z, li,
0, 0, 0, 0); 0);
writer.append<ta_vertex_parameter::polygon_type_5>() = writer.append<ta_vertex_parameter::polygon_type_7>() =
ta_vertex_parameter::polygon_type_5(polygon_vertex_parameter_control_word(false), ta_vertex_parameter::polygon_type_7(polygon_vertex_parameter_control_word(false),
bp.x, bp.y, bp.z, bp.x, bp.y, bp.z,
bt.x, bt.y, bt.x, bt.y,
1.0, bc.x, bc.y, bc.z, li,
0, 0, 0, 0); 0);
writer.append<ta_vertex_parameter::polygon_type_5>() = writer.append<ta_vertex_parameter::polygon_type_7>() =
ta_vertex_parameter::polygon_type_5(polygon_vertex_parameter_control_word(true), ta_vertex_parameter::polygon_type_7(polygon_vertex_parameter_control_word(true),
cp.x, cp.y, cp.z, cp.x, cp.y, cp.z,
ct.x, ct.y, ct.x, ct.y,
1.0, cc.x, cc.y, cc.z, li,
0, 0, 0, 0); 0);
} }
static inline void render_clip_tri_type_5(ta_parameter_writer& writer, static inline void render_tri_type_13(ta_parameter_writer& writer,
vec3 ap,
vec3 bp,
vec3 cp,
vec2 at0,
vec2 bt0,
vec2 ct0,
vec2 at1,
vec2 bt1,
vec2 ct1,
float li0,
float li1)
{
typen_tri_count += 1;
writer.append<ta_vertex_parameter::polygon_type_13>() =
ta_vertex_parameter::polygon_type_13(polygon_vertex_parameter_control_word(false),
ap.x, ap.y, ap.z,
at0.x, at0.y,
li0,
0, // offset intensity 0
at1.x, at1.y,
li1,
0 // offset intensity 1
);
writer.append<ta_vertex_parameter::polygon_type_13>() =
ta_vertex_parameter::polygon_type_13(polygon_vertex_parameter_control_word(false),
bp.x, bp.y, bp.z,
bt0.x, bt0.y,
li0,
0, // offset intensity 0
bt1.x, bt1.y,
li1,
0 // offset intensity 1
);
writer.append<ta_vertex_parameter::polygon_type_13>() =
ta_vertex_parameter::polygon_type_13(polygon_vertex_parameter_control_word(true),
cp.x, cp.y, cp.z,
ct0.x, ct0.y,
li0,
0, // offset intensity 0
ct1.x, ct1.y,
li1,
0 // offset intensity 1
);
}
static inline void render_clip_tri_type_7(ta_parameter_writer& writer,
vec3 ap, vec3 ap,
vec3 bp, vec3 bp,
vec3 cp, vec3 cp,
vec2 at, vec2 at,
vec2 bt, vec2 bt,
vec2 ct, vec2 ct,
vec3 ac, float li)
vec3 bc,
vec3 cc)
{ {
//return; //return;
const vec3 plane_point = {0.f, 0.f, 1.f}; const vec3 plane_point = {0.f, 0.f, 1.f};
@ -375,19 +502,15 @@ static inline void render_clip_tri_type_5(ta_parameter_writer& writer,
vec3 preclip_position[] = {ap, bp, cp}; vec3 preclip_position[] = {ap, bp, cp};
vec2 preclip_texture[] = {at, bt, ct}; vec2 preclip_texture[] = {at, bt, ct};
vec3 preclip_color[] = {ac, bc, cc};
vec3 clip_position[4]; vec3 clip_position[4];
vec2 clip_texture[4]; vec2 clip_texture[4];
vec3 clip_color[4]; int output_length = geometry::clip_polygon_2<3>(clip_position,
int output_length = geometry::clip_polygon_3<3>(clip_position,
clip_texture, clip_texture,
clip_color,
plane_point, plane_point,
plane_normal, plane_normal,
preclip_position, preclip_position,
preclip_texture, preclip_texture);
preclip_color);
{ {
vec3 ap; vec3 ap;
@ -399,40 +522,31 @@ static inline void render_clip_tri_type_5(ta_parameter_writer& writer,
const vec2& bt = clip_texture[1]; const vec2& bt = clip_texture[1];
const vec2& ct = clip_texture[2]; const vec2& ct = clip_texture[2];
const vec2& dt = clip_texture[3]; const vec2& dt = clip_texture[3];
const vec3& ac = clip_color[0];
const vec3& bc = clip_color[1];
const vec3& cc = clip_color[2];
const vec3& dc = clip_color[3];
if (output_length >= 3) { if (output_length >= 3) {
ap = screen_transform(clip_position[0]); ap = screen_transform(clip_position[0]);
bp = screen_transform(clip_position[1]); bp = screen_transform(clip_position[1]);
cp = screen_transform(clip_position[2]); cp = screen_transform(clip_position[2]);
render_tri_type_5(writer, render_tri_type_7(writer,
ap, ap,
bp, bp,
cp, cp,
at, at,
bt, bt,
ct, ct,
ac, li);
bc,
cc);
} }
if (output_length >= 4) { if (output_length >= 4) {
dp = screen_transform(clip_position[3]); dp = screen_transform(clip_position[3]);
render_tri_type_5(writer, render_tri_type_7(writer,
ap, ap,
cp, cp,
dp, dp,
at, at,
ct, ct,
dt, dt,
ac, li);
cc,
dc);
} }
} }
} }
@ -481,6 +595,9 @@ static inline void transfer_face(ta_parameter_writer& writer, q3bsp_face_t * fac
(face->texture < textures_length) && (face->texture < textures_length) &&
(textures[face->texture].size != 0); (textures[face->texture].size != 0);
if (!has_texture)
return;
/*
if (face->texture != *last_texture) { if (face->texture != *last_texture) {
*last_texture = face->texture; *last_texture = face->texture;
if (has_texture) { if (has_texture) {
@ -489,6 +606,7 @@ static inline void transfer_face(ta_parameter_writer& writer, q3bsp_face_t * fac
//global_polygon_type_1(writer, 0, 0, 0); //global_polygon_type_1(writer, 0, 0, 0);
} }
} }
*/
for (int j = 0; j < triangles; j++) { for (int j = 0; j < triangles; j++) {
@ -509,39 +627,46 @@ static inline void transfer_face(ta_parameter_writer& writer, q3bsp_face_t * fac
vec3 n = vertex_cache[aix].normal; vec3 n = vertex_cache[aix].normal;
float li = light_intensity(light_vec, n); float li = light_intensity(light_vec, n);
vec3 ac = (vec3){1, 1, 1} * li;
vec3 bc = ac;
vec3 cc = ac;
if (has_texture) { if (has_texture) {
float v_mul = textures[face->texture].v_mul; float v_mul = textures[face->texture].v_mul;
vec2 at = {vert[aix].texcoord[0], vert[aix].texcoord[1] * 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 bt = {vert[bix].texcoord[0], vert[bix].texcoord[1] * v_mul};
vec2 ct = {vert[cix].texcoord[0], vert[cix].texcoord[1] * v_mul}; vec2 ct = {vert[cix].texcoord[0], vert[cix].texcoord[1] * v_mul};
vec2 alm = {vert[aix].lightmapcoord[0], vert[aix].lightmapcoord[1]};
vec2 blm = {vert[bix].lightmapcoord[0], vert[bix].lightmapcoord[1]};
vec2 clm = {vert[cix].lightmapcoord[0], vert[cix].lightmapcoord[1]};
if (ap.z < 0 || bp.z < 0 || cp.z < 0) { if (ap.z < 0 || bp.z < 0 || cp.z < 0) {
render_clip_tri_type_5(writer, /*
render_clip_tri_type_7(writer,
ap, ap,
bp, bp,
cp, cp,
at, at,
bt, bt,
ct, ct,
ac, li);
bc, */
cc); } else if (face->lm_index >= 0) {
vec3 aps = screen_transform(ap);
vec3 bps = screen_transform(bp);
vec3 cps = screen_transform(cp);
} else { global_texture_lightmap(writer, face->texture, face->lm_index);
render_tri_type_5(writer,
screen_transform(ap), render_tri_type_13(writer,
screen_transform(bp), aps,
screen_transform(cp), bps,
at, cps,
bt, at,
ct, bt,
ac, ct,
bc, alm,
cc); blm,
clm,
li,
1.0);
} }
} else { } else {
/* /*
@ -549,8 +674,6 @@ static inline void transfer_face(ta_parameter_writer& writer, q3bsp_face_t * fac
screen_transform(ap), screen_transform(ap),
screen_transform(bp), screen_transform(bp),
screen_transform(cp), screen_transform(cp),
li,
li,
li); li);
*/ */
} }
@ -639,8 +762,6 @@ void transfer_icosphere(ta_parameter_writer& writer, const mat4x4& screen_trans)
screen_transform(ap), screen_transform(ap),
screen_transform(bp), screen_transform(bp),
screen_transform(cp), screen_transform(cp),
li,
li,
li); li);
} }
} }
@ -912,7 +1033,7 @@ void render_tris_count(ta_parameter_writer& writer)
{ {
char s[32] = "rendered tris: "; char s[32] = "rendered tris: ";
int row = 2; int row = 2;
render_num(writer, row, s, type5_tri_count, offset); render_num(writer, row, s, typen_tri_count, offset);
} }
} }
@ -1087,6 +1208,43 @@ void render_visible_faces(ta_parameter_writer& writer, const mat4x4& trans, cons
} }
} }
void transfer_modifier_volume(ta_parameter_writer& writer)
{
const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume
| para_control::list_type::opaque_modifier_volume;
const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::volume_instruction::normal_polygon
| isp_tsp_instruction_word::culling_mode::no_culling;
writer.append<ta_global_parameter::modifier_volume>() =
ta_global_parameter::modifier_volume(parameter_control_word,
isp_tsp_instruction_word
);
writer.append<ta_vertex_parameter::modifier_volume>() =
ta_vertex_parameter::modifier_volume(modifier_volume_vertex_parameter_control_word(),
0, 0, 1,
640, 0, 1,
640, 480, 1);
const uint32_t last_parameter_control_word = para_control::para_type::polygon_or_modifier_volume
| para_control::list_type::opaque_modifier_volume
| obj_control::volume::modifier_volume::last_in_volume;
const uint32_t last_isp_tsp_instruction_word = isp_tsp_instruction_word::volume_instruction::inside_last_polygon
| isp_tsp_instruction_word::culling_mode::no_culling;
writer.append<ta_global_parameter::modifier_volume>() =
ta_global_parameter::modifier_volume(last_parameter_control_word,
last_isp_tsp_instruction_word);
writer.append<ta_vertex_parameter::modifier_volume>() =
ta_vertex_parameter::modifier_volume(modifier_volume_vertex_parameter_control_word(),
0, 0, 1,
640, 480, 1,
0, 480, 1);
}
void transfer_scene(ta_parameter_writer& writer, const mat4x4& screen_trans, const mat4x4& screen_trans_inv) void transfer_scene(ta_parameter_writer& writer, const mat4x4& screen_trans, const mat4x4& screen_trans_inv)
{ {
uint8_t * buf = reinterpret_cast<uint8_t *>(bsp_start); uint8_t * buf = reinterpret_cast<uint8_t *>(bsp_start);
@ -1101,23 +1259,29 @@ void transfer_scene(ta_parameter_writer& writer, const mat4x4& screen_trans, con
int face_count = fe->length / (sizeof (struct q3bsp_face)); int face_count = fe->length / (sizeof (struct q3bsp_face));
//transfer_faces(writer); //transfer_faces(writer);
transfer_icosphere(writer, trans); //transfer_icosphere(writer, trans);
render_matrix(writer, screen_trans); //render_matrix(writer, screen_trans);
//render_leaf_ix(writer); //render_leaf_ix(writer);
render_sphere_position(writer); //render_sphere_position(writer);
//render_zero_position(writer, screen_trans_inv); //render_zero_position(writer, screen_trans_inv);
vec3 pos = screen_trans_inv * (vec3){0, 0, 0}; vec3 pos = screen_trans_inv * (vec3){0, 0, 0};
type5_tri_count = 0; typen_tri_count = 0;
vis_tri_count = 0; vis_tri_count = 0;
for (int i = 0; i < face_count; i++) face_cache[i] = 0; for (int i = 0; i < face_count; i++) face_cache[i] = 0;
render_visible_faces(writer, trans, pos); render_visible_faces(writer, trans, pos);
render_tris_count(writer); //render_tris_count(writer);
writer.append<ta_global_parameter::end_of_list>() = writer.append<ta_global_parameter::end_of_list>() =
ta_global_parameter::end_of_list(para_control::para_type::end_of_list); ta_global_parameter::end_of_list(para_control::para_type::end_of_list);
transfer_modifier_volume(writer);
writer.append<ta_global_parameter::end_of_list>() =
ta_global_parameter::end_of_list(para_control::para_type::end_of_list);
/*
global_polygon_type_0(writer); global_polygon_type_0(writer);
render_quad(writer, render_quad(writer,
{0, 0, 0}, {0, 0, 0},
@ -1131,6 +1295,7 @@ void transfer_scene(ta_parameter_writer& writer, const mat4x4& screen_trans, con
writer.append<ta_global_parameter::end_of_list>() = writer.append<ta_global_parameter::end_of_list>() =
ta_global_parameter::end_of_list(para_control::para_type::end_of_list); ta_global_parameter::end_of_list(para_control::para_type::end_of_list);
*/
} }
uint8_t __attribute__((aligned(32))) ta_parameter_buf[1024 * 1024 * 2]; uint8_t __attribute__((aligned(32))) ta_parameter_buf[1024 * 1024 * 2];
@ -1197,14 +1362,48 @@ void transfer_ta_fifo_texture_memory_32byte(void * dst, void * src, int length)
} }
} }
void transfer_lightmaps()
{
uint8_t * buf = reinterpret_cast<uint8_t *>(bsp_start);
q3bsp_header_t * header = reinterpret_cast<q3bsp_header_t *>(buf);
q3bsp_direntry * lme = &header->direntries[LUMP_LIGHTMAPS];
q3bsp_lightmap_t * lightmaps = reinterpret_cast<q3bsp_lightmap_t *>(&buf[lme->offset]);
int count = lme->length / (sizeof (struct q3bsp_lightmap));
uint16_t temp[128 * 128];
lightmap_base = 0;
for (int i = 0; i < count; i++) {
q3bsp_lightmap_t * lightmap = &lightmaps[i];
for (int j = 0; j < 128 * 128; j++) {
uint8_t * c = &lightmap->u8[j * 3];
temp[j] = rgb565(c[0], c[1], c[2]);
}
uint32_t offset = texture_memory_alloc.texture.start + font_base + lightmap_base;
void * dst = reinterpret_cast<void *>(&ta_fifo_texture_memory[offset / 4]);
uint32_t size = 128 * 128 * 2;
transfer_ta_fifo_texture_memory_32byte(dst, temp, size);
lightmap_base += 128 * 128 * 2;
}
}
void transfer_textures() void transfer_textures()
{ {
system.LMMODE0 = 0; // 64-bit address space system.LMMODE0 = 0; // 64-bit address space
system.LMMODE1 = 0; // 64-bit address space system.LMMODE1 = 0; // 64-bit address space
transfer_lightmaps();
printf("lightmap base: %d\n", lightmap_base);
int textures_length = (sizeof (textures)) / (sizeof (textures[0])); int textures_length = (sizeof (textures)) / (sizeof (textures[0]));
for (int i = 0; i < textures_length; i++) { for (int i = 0; i < textures_length; i++) {
uint32_t offset = texture_memory_alloc.texture.start + font_offset + textures[i].offset; uint32_t offset = texture_memory_alloc.texture.start + font_base + lightmap_base + textures[i].offset;
void * dst = reinterpret_cast<void *>(&ta_fifo_texture_memory[offset / 4]); void * dst = reinterpret_cast<void *>(&ta_fifo_texture_memory[offset / 4]);
void * src = textures[i].start; void * src = textures[i].start;
uint32_t size = textures[i].size; uint32_t size = textures[i].size;
@ -1320,7 +1519,7 @@ void transfer_font()
8, // texture_width 8, // texture_width
16, // texture_height 16, // texture_height
src); src);
printf("font_offset %d actual %d\n", font_offset, offset); printf("font_base %d actual %d\n", font_base, offset);
} }
int main() int main()
@ -1335,20 +1534,20 @@ int main()
palette_data<3>(); palette_data<3>();
constexpr uint32_t ta_alloc = 0 constexpr uint32_t ta_alloc = 0
| ta_alloc_ctrl::pt_opb::no_list | ta_alloc_ctrl::pt_opb::_16x4byte
| ta_alloc_ctrl::tm_opb::no_list | ta_alloc_ctrl::tm_opb::no_list
| ta_alloc_ctrl::t_opb::_16x4byte | ta_alloc_ctrl::t_opb::no_list
| ta_alloc_ctrl::om_opb::no_list | ta_alloc_ctrl::om_opb::_16x4byte
| ta_alloc_ctrl::o_opb::_16x4byte; | ta_alloc_ctrl::o_opb::no_list;
constexpr int ta_cont_count = 1; constexpr int ta_cont_count = 1;
constexpr struct opb_size opb_size[ta_cont_count] = { constexpr struct opb_size opb_size[ta_cont_count] = {
{ {
.opaque = 16 * 4, .opaque = 0,
.opaque_modifier = 0, .opaque_modifier = 16 * 4,
.translucent = 16 * 4, .translucent = 0,
.translucent_modifier = 0, .translucent_modifier = 0,
.punch_through = 0 .punch_through = 16 * 4
} }
}; };
@ -1401,6 +1600,8 @@ int main()
do_get_condition(); do_get_condition();
holly.FPU_SHAD_SCALE = fpu_shad_scale::simple_shadow_enable::parameter_selection_volume_mode;
while (1) { while (1) {
maple::dma_wait_complete(); maple::dma_wait_complete();
do_get_condition(); do_get_condition();
@ -1422,7 +1623,10 @@ int main()
transfer_scene(writer, trans, trans_inv); transfer_scene(writer, trans, trans_inv);
ta_polygon_converter_writeback(writer.buf, writer.offset); ta_polygon_converter_writeback(writer.buf, writer.offset);
ta_polygon_converter_transfer(writer.buf, writer.offset); ta_polygon_converter_transfer(writer.buf, writer.offset);
ta_wait_translucent_list(); //serial::integer<uint32_t>(writer.offset);
//serial::integer<uint32_t>(typen_tri_count);
//serial::string("wait_pt\n");
ta_wait_opaque_modifier_volume_list();
//ta_wait_opaque_list(); //ta_wait_opaque_list();
render_done = 0; render_done = 0;
@ -1431,6 +1635,7 @@ int main()
texture_memory_alloc.background[core].start, texture_memory_alloc.background[core].start,
texture_memory_alloc.framebuffer[core].start, texture_memory_alloc.framebuffer[core].start,
framebuffer_width); framebuffer_width);
//serial::string("wait_render\n");
while (render_done == 0) { while (render_done == 0) {
asm volatile ("nop"); asm volatile ("nop");
}; };

1
example/example.mk
View File

@ -271,6 +271,7 @@ MODIFIER_VOLUME_WITH_TWO_VOLUMES_OBJ = \
texture/wolf/wolf.data.o \ texture/wolf/wolf.data.o \
texture/macaw/macaw.data.o \ texture/macaw/macaw.data.o \
maple/maple.o \ maple/maple.o \
sh7091/serial.o \
$(LIBGCC) $(LIBGCC)
example/modifier_volume_with_two_volumes.elf: LDSCRIPT = $(LIB)/main.lds example/modifier_volume_with_two_volumes.elf: LDSCRIPT = $(LIB)/main.lds

68
example/modifier_volume_with_two_volumes.cpp
View File

@ -164,7 +164,7 @@ uint32_t argb8888(const vec4& color)
; ;
} }
void transform_polygon(ta_parameter_writer& parameter, void transform_polygon(ta_parameter_writer& writer,
const vec3 * vertices, const vec3 * vertices,
const vec2 * texture, const vec2 * texture,
const face_vtn& face, const face_vtn& face,
@ -174,7 +174,7 @@ void transform_polygon(ta_parameter_writer& parameter,
const struct rot_pos& rot_pos) const struct rot_pos& rot_pos)
{ {
const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume const uint32_t parameter_control_word = para_control::para_type::polygon_or_modifier_volume
| para_control::list_type::opaque | para_control::list_type::punch_through
| obj_control::col_type::packed_color | obj_control::col_type::packed_color
| obj_control::shadow | obj_control::shadow
| obj_control::volume::polygon::with_two_volumes | obj_control::volume::polygon::with_two_volumes
@ -183,7 +183,13 @@ void transform_polygon(ta_parameter_writer& parameter,
const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::depth_compare_mode::greater const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::depth_compare_mode::greater
| isp_tsp_instruction_word::culling_mode::no_culling; | isp_tsp_instruction_word::culling_mode::no_culling;
const uint32_t tsp_instruction_word = tsp_instruction_word::src_alpha_instr::one const uint32_t tsp_instruction_word_0 = tsp_instruction_word::src_alpha_instr::one
| tsp_instruction_word::dst_alpha_instr::zero
| tsp_instruction_word::fog_control::no_fog
| tsp_instruction_word::texture_u_size::from_int(128)
| tsp_instruction_word::texture_v_size::from_int(128);
const uint32_t tsp_instruction_word_1 = tsp_instruction_word::src_alpha_instr::other_color
| tsp_instruction_word::dst_alpha_instr::zero | tsp_instruction_word::dst_alpha_instr::zero
| tsp_instruction_word::fog_control::no_fog | tsp_instruction_word::fog_control::no_fog
| tsp_instruction_word::texture_u_size::from_int(128) | tsp_instruction_word::texture_u_size::from_int(128)
@ -202,12 +208,12 @@ void transform_polygon(ta_parameter_writer& parameter,
| texture_control_word::scan_order::twiddled | texture_control_word::scan_order::twiddled
| texture_control_word::texture_address(texture_address_1 / 8); | texture_control_word::texture_address(texture_address_1 / 8);
parameter.append<ta_global_parameter::polygon_type_3>() = writer.append<ta_global_parameter::polygon_type_3>() =
ta_global_parameter::polygon_type_3(parameter_control_word, ta_global_parameter::polygon_type_3(parameter_control_word,
isp_tsp_instruction_word, isp_tsp_instruction_word,
tsp_instruction_word, // tsp_instruction_word_0 tsp_instruction_word_0, // tsp_instruction_word_0
texture_control_word_0, // texture_control_word_0 texture_control_word_0, // texture_control_word_0
tsp_instruction_word, // tsp_instruction_word_1 tsp_instruction_word_1, // tsp_instruction_word_1
texture_control_word_1, // texture_control_word_1 texture_control_word_1, // texture_control_word_1
0, // data_size_for_sort_dma 0, // data_size_for_sort_dma
0 // next_address_for_sort_dma 0 // next_address_for_sort_dma
@ -224,7 +230,7 @@ void transform_polygon(ta_parameter_writer& parameter,
auto& uv = texture[texture_ix]; auto& uv = texture[texture_ix];
bool end_of_strip = i == strip_length - 1; bool end_of_strip = i == strip_length - 1;
parameter.append<ta_vertex_parameter::polygon_type_11>() = writer.append<ta_vertex_parameter::polygon_type_11>() =
ta_vertex_parameter::polygon_type_11(polygon_vertex_parameter_control_word(end_of_strip), ta_vertex_parameter::polygon_type_11(polygon_vertex_parameter_control_word(end_of_strip),
point.x, point.x,
point.y, point.y,
@ -241,7 +247,7 @@ void transform_polygon(ta_parameter_writer& parameter,
} }
} }
void transform_modifier_volume(ta_parameter_writer& parameter, void transform_modifier_volume(ta_parameter_writer& writer,
const vec3 * vertices, const vec3 * vertices,
const face_vtn * faces, const face_vtn * faces,
const uint32_t num_faces, const uint32_t num_faces,
@ -256,7 +262,7 @@ void transform_modifier_volume(ta_parameter_writer& parameter,
const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::volume_instruction::normal_polygon const uint32_t isp_tsp_instruction_word = isp_tsp_instruction_word::volume_instruction::normal_polygon
| isp_tsp_instruction_word::culling_mode::no_culling; | isp_tsp_instruction_word::culling_mode::no_culling;
parameter.append<ta_global_parameter::modifier_volume>() = writer.append<ta_global_parameter::modifier_volume>() =
ta_global_parameter::modifier_volume(parameter_control_word, ta_global_parameter::modifier_volume(parameter_control_word,
isp_tsp_instruction_word isp_tsp_instruction_word
); );
@ -281,13 +287,13 @@ void transform_modifier_volume(ta_parameter_writer& parameter,
const uint32_t last_isp_tsp_instruction_word = isp_tsp_instruction_word::volume_instruction::inside_last_polygon const uint32_t last_isp_tsp_instruction_word = isp_tsp_instruction_word::volume_instruction::inside_last_polygon
| isp_tsp_instruction_word::culling_mode::no_culling; | isp_tsp_instruction_word::culling_mode::no_culling;
parameter.append<ta_global_parameter::modifier_volume>() = writer.append<ta_global_parameter::modifier_volume>() =
ta_global_parameter::modifier_volume(last_parameter_control_word, ta_global_parameter::modifier_volume(last_parameter_control_word,
last_isp_tsp_instruction_word); last_isp_tsp_instruction_word);
} }
parameter.append<ta_vertex_parameter::modifier_volume>() = writer.append<ta_vertex_parameter::modifier_volume>() =
ta_vertex_parameter::modifier_volume(modifier_volume_vertex_parameter_control_word(), ta_vertex_parameter::modifier_volume(modifier_volume_vertex_parameter_control_word(),
a.x, a.y, a.z, a.x, a.y, a.z,
b.x, b.y, b.z, b.x, b.y, b.z,
@ -340,7 +346,7 @@ void update_rot_pos(struct rot_pos& rot_pos)
rot_pos.theta += rotation * half_degree * 10.f; rot_pos.theta += rotation * half_degree * 10.f;
} }
uint32_t _ta_parameter_buf[((32 * 8192) + 32) / 4]; uint8_t __attribute__((aligned(32))) ta_parameter_buf[((32 * 8192) + 32) / 4];
void main() void main()
{ {
@ -355,10 +361,19 @@ void main()
load_texture(src0, size0, 0); load_texture(src0, size0, 0);
load_texture(src1, size1, 1); load_texture(src1, size1, 1);
// The address of `ta_parameter_buf` must be a multiple of 32 bytes. constexpr uint32_t ta_alloc = ta_alloc_ctrl::pt_opb::_16x4byte
// This is mandatory for ch2-dma to the ta fifo polygon converter. | ta_alloc_ctrl::tm_opb::no_list
uint32_t * ta_parameter_buf = align_32byte(_ta_parameter_buf); | ta_alloc_ctrl::t_opb::no_list
| ta_alloc_ctrl::om_opb::_16x4byte
| ta_alloc_ctrl::o_opb::no_list;
constexpr struct opb_size opb_size = { .opaque = 0
, .opaque_modifier = 16 * 4
, .translucent = 0
, .translucent_modifier = 0
, .punch_through = 16 * 4,
};
/*
constexpr uint32_t ta_alloc = ta_alloc_ctrl::pt_opb::no_list constexpr uint32_t ta_alloc = ta_alloc_ctrl::pt_opb::no_list
| ta_alloc_ctrl::tm_opb::no_list | ta_alloc_ctrl::tm_opb::no_list
| ta_alloc_ctrl::t_opb::no_list | ta_alloc_ctrl::t_opb::no_list
@ -366,11 +381,12 @@ void main()
| ta_alloc_ctrl::o_opb::_16x4byte; | ta_alloc_ctrl::o_opb::_16x4byte;
constexpr struct opb_size opb_size = { .opaque = 16 * 4 constexpr struct opb_size opb_size = { .opaque = 16 * 4
, .opaque_modifier = 16 * 4 , .opaque_modifier = 16 * 4
, .translucent = 0 , .translucent = 0
, .translucent_modifier = 0 , .translucent_modifier = 0
, .punch_through = 0 , .punch_through = 0,
}; };
*/
holly.SOFTRESET = softreset::pipeline_soft_reset holly.SOFTRESET = softreset::pipeline_soft_reset
| softreset::ta_soft_reset; | softreset::ta_soft_reset;
@ -393,13 +409,13 @@ void main()
ta_alloc, ta_alloc,
640 / 32, 640 / 32,
480 / 32); 480 / 32);
auto parameter = ta_parameter_writer(ta_parameter_buf); auto writer = ta_parameter_writer(ta_parameter_buf, (sizeof (ta_parameter_buf)));
{ // plane { // plane
vec4 color0 = {1.0, 0.9, 0.9, 0.9}; vec4 color0 = {1.0, 0.9, 0.9, 0.9};
vec4 color1 = {1.0, 0.9, 0.9, 0.9}; vec4 color1 = {1.0, 0.9, 0.9, 0.9};
float scale = 2.f; float scale = 2.f;
for (uint32_t i = 0; i < plane::num_faces; i++) { for (uint32_t i = 0; i < plane::num_faces; i++) {
transform_polygon(parameter, transform_polygon(writer,
plane::vertices, plane::vertices,
plane::texture, plane::texture,
plane::faces[i], plane::faces[i],
@ -420,29 +436,35 @@ void main()
*/ */
} }
// end of opaque list // end of opaque list
parameter.append<ta_global_parameter::end_of_list>() = ta_global_parameter::end_of_list(para_control::para_type::end_of_list); writer.append<ta_global_parameter::end_of_list>() = ta_global_parameter::end_of_list(para_control::para_type::end_of_list);
{ // cube { // cube
float scale = 1.f; float scale = 1.f;
transform_modifier_volume(parameter, transform_modifier_volume(writer,
cube::vertices, cube::vertices,
cube::faces, cube::faces,
cube::num_faces, cube::num_faces,
scale); scale);
} }
// end of opaque modifier list // end of opaque modifier list
parameter.append<ta_global_parameter::end_of_list>() = ta_global_parameter::end_of_list(para_control::para_type::end_of_list); writer.append<ta_global_parameter::end_of_list>() = ta_global_parameter::end_of_list(para_control::para_type::end_of_list);
ta_polygon_converter_transfer(ta_parameter_buf, parameter.offset);
ta_polygon_converter_writeback(writer.buf, writer.offset);
ta_polygon_converter_transfer(writer.buf, writer.offset);
ta_wait_opaque_modifier_volume_list(); ta_wait_opaque_modifier_volume_list();
core_start_render(frame_ix); core_start_render(frame_ix);
core_wait_end_of_render_video(); core_wait_end_of_render_video();
while (!spg_status::vsync(holly.SPG_STATUS)); while (!spg_status::vsync(holly.SPG_STATUS));
core_flip(frame_ix); core_flip(frame_ix);
while (spg_status::vsync(holly.SPG_STATUS)); while (spg_status::vsync(holly.SPG_STATUS));
frame_ix = (frame_ix + 1) & 1; frame_ix = (frame_ix + 1) & 1;
} }
} }

17
holly/ta_vertex_parameter.hpp
View File

@ -684,11 +684,11 @@ namespace ta_vertex_parameter {
float z; float z;
float u_0; float u_0;
float v_0; float v_0;
uint32_t base_intensity_0; float base_intensity_0;
float offset_intensity_0; float offset_intensity_0;
float u_1; float u_1;
float v_1; float v_1;
uint32_t base_intensity_1; float base_intensity_1;
float offset_intensity_1; float offset_intensity_1;
uint32_t _res0; uint32_t _res0;
uint32_t _res1; uint32_t _res1;
@ -701,11 +701,11 @@ namespace ta_vertex_parameter {
const float z, const float z,
const float u_0, const float u_0,
const float v_0, const float v_0,
const uint32_t base_intensity_0, const float base_intensity_0,
const float offset_intensity_0, const float offset_intensity_0,
const float u_1, const float u_1,
const float v_1, const float v_1,
const uint32_t base_intensity_1, const float base_intensity_1,
const float offset_intensity_1 const float offset_intensity_1
) )
: parameter_control_word(parameter_control_word) : parameter_control_word(parameter_control_word)
@ -756,11 +756,11 @@ namespace ta_vertex_parameter {
float z; float z;
uint32_t u_v_0; uint32_t u_v_0;
uint32_t _res0; uint32_t _res0;
uint32_t base_intensity_0; float base_intensity_0;
float offset_intensity_0; float offset_intensity_0;
uint32_t u_v_1; uint32_t u_v_1;
uint32_t _res1; uint32_t _res1;
uint32_t base_intensity_1; float base_intensity_1;
float offset_intensity_1; float offset_intensity_1;
uint32_t _res2; uint32_t _res2;
uint32_t _res3; uint32_t _res3;
@ -772,10 +772,10 @@ namespace ta_vertex_parameter {
const float y, const float y,
const float z, const float z,
const uint32_t u_v_0, const uint32_t u_v_0,
const uint32_t base_intensity_0, const float base_intensity_0,
const float offset_intensity_0, const float offset_intensity_0,
const uint32_t u_v_1, const uint32_t u_v_1,
const uint32_t base_intensity_1, const float base_intensity_1,
const float offset_intensity_1 const float offset_intensity_1
) )
: parameter_control_word(parameter_control_word) : parameter_control_word(parameter_control_word)
@ -1037,4 +1037,3 @@ namespace ta_vertex_parameter {
static_assert((offsetof (struct modifier_volume, _res5)) == 0x3c); static_assert((offsetof (struct modifier_volume, _res5)) == 0x3c);
} }

5
q3bsp/q3bsp.h
View File

@ -130,7 +130,10 @@ typedef struct q3bsp_face {
} q3bsp_face_t; } q3bsp_face_t;
typedef struct q3bsp_lightmap { typedef struct q3bsp_lightmap {
uint8_t map[128][128][3]; union {
uint8_t u8[128 * 128 * 3];
uint8_t map[128][128][3];
};
} q3bsp_lightmap_t; } q3bsp_lightmap_t;
typedef struct q3bsp_visdata { typedef struct q3bsp_visdata {