bilbo/nds
1
0
Fork 0
Code Pull Requests Activity

happy_mask_salesman: unrot

Browse Source
This commit is contained in:
Zack Buhman 2025-07-25 20:34:19 -05:00
parent 6eda2bba0a
commit aa72969f36
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arm9/examples/happy_mask_salesman.c
View File

@ -386,7 +386,7 @@ void main()
struct model * model = &happy_mask_salesman_model;
for (int object_ix = 0; object_ix < model->object_count; object_ix++) {
struct object * obj = model->object[object_ix];
const struct object * obj = model->object[object_ix];
const int num_triangles = obj->triangle_count;
int material_ix = obj->material;
@ -411,54 +411,54 @@ void main()
for (int i = 0; i < num_triangles; i++) {
// "When texture mapping, the Geometry Engine works faster if you
// issue commands in the following order: TexCoord→Normal→Vertex."
struct vertex_texture * at = &model->texture[obj->triangle[i].a.texture];
const struct vertex_texture * at = &model->texture[obj->triangle[i].a.texture];
io_registers.a.TEXCOORD = 0
| TEXCOORD__t_coordinate(v_to_t(at->v, height))
| TEXCOORD__s_coordinate(u_to_s(at->u, width));
struct vertex_normal * an = &model->normal[obj->triangle[i].a.normal];
const struct vertex_normal * an = &model->normal[obj->triangle[i].a.normal];
io_registers.a.NORMAL = 0
| NORMAL__z_component(an->z)
| NORMAL__y_component(an->y)
| NORMAL__x_component(an->x);
struct vertex_position * a = &model->position[obj->triangle[i].a.position];
const struct vertex_position * a = &model->position[obj->triangle[i].a.position];
io_registers.a.VTX_16 = 0
| VTX_16__0__y_coordinate(a->y)
| VTX_16__0__x_coordinate(a->x);
io_registers.a.VTX_16 = 0
| VTX_16__1__z_coordinate(a->z);
struct vertex_texture * bt = &model->texture[obj->triangle[i].b.texture];
const struct vertex_texture * bt = &model->texture[obj->triangle[i].b.texture];
io_registers.a.TEXCOORD = 0
| TEXCOORD__t_coordinate(v_to_t(bt->v, height))
| TEXCOORD__s_coordinate(u_to_s(bt->u, width));
struct vertex_normal * bn = &model->normal[obj->triangle[i].b.normal];
const struct vertex_normal * bn = &model->normal[obj->triangle[i].b.normal];
io_registers.a.NORMAL = 0
| NORMAL__z_component(bn->z)
| NORMAL__y_component(bn->y)
| NORMAL__x_component(bn->x);
struct vertex_position * b = &model->position[obj->triangle[i].b.position];
const struct vertex_position * b = &model->position[obj->triangle[i].b.position];
io_registers.a.VTX_16 = 0
| VTX_16__0__y_coordinate(b->y)
| VTX_16__0__x_coordinate(b->x);
io_registers.a.VTX_16 = 0
| VTX_16__1__z_coordinate(b->z);
struct vertex_texture * ct = &model->texture[obj->triangle[i].c.texture];
const struct vertex_texture * ct = &model->texture[obj->triangle[i].c.texture];
io_registers.a.TEXCOORD = 0
| TEXCOORD__t_coordinate(v_to_t(ct->v, height))
| TEXCOORD__s_coordinate(u_to_s(ct->u, width));
struct vertex_normal * cn = &model->normal[obj->triangle[i].c.normal];
const struct vertex_normal * cn = &model->normal[obj->triangle[i].c.normal];
io_registers.a.NORMAL = 0
| NORMAL__z_component(cn->z)
| NORMAL__y_component(cn->y)
| NORMAL__x_component(cn->x);
struct vertex_position * c = &model->position[obj->triangle[i].c.position];
const struct vertex_position * c = &model->position[obj->triangle[i].c.position];
io_registers.a.VTX_16 = 0
| VTX_16__0__y_coordinate(c->y)
| VTX_16__0__x_coordinate(c->x);

3
model/happy_mask_salesman/model.h
View File

@ -13220,7 +13220,7 @@ struct object happy_mask_salesman_node_03D5E21E_geom_03D5E21E = {
.material = material_0194E6CE,
};
struct object * happy_mask_salesman_object_list[] = {
const struct object * happy_mask_salesman_object_list[] = {
&happy_mask_salesman_node_0010E986_geom_0010E986,
&happy_mask_salesman_node_00432028_001_geom_00432028_001,
&happy_mask_salesman_node_00432028_001_geom_00432028_001_000,
@ -13247,4 +13247,3 @@ struct model happy_mask_salesman_model = {
.object = &happy_mask_salesman_object_list[0],
.object_count = 17,
};