Skip to content

fill out viewport_spatter_flag #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ab9rf merged 2 commits into from
Aug 22, 2026
+20 −5
Merged

fill out viewport_spatter_flag #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ce7d9e
fill out `viewport_spatter_flag`
ab9rf Aug 21, 2026
8927af4
update based on review
ab9rf Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Template for new versions:

## Structures
- added support for overriding code generation for a specific type
- added ``graphic_viewport_spatter_flag`` and related definitions

# 53.16-r1

Expand Down
4 changes: 0 additions & 4 deletions df.descriptor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,6 @@
<int32_t name='texpos'/>
</struct-type>

<bitfield-type type-name='viewport_spatter_flag' base-type='uint32_t'> TODO: defined in g_src/graphics.h
<flag-bit name='todo'/>
</bitfield-type>

<struct-type type-name='spatter_graphics_infost'>
<int64_t name='flags' original-name='local_id'/> cannot use bitfield here, since it ignores base-type
<int32_t name='texpos'/>
Expand Down
20 changes: 19 additions & 1 deletion df.g_src.graphics.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,24 @@
-- Skipped: VIEWPORT_FLOOR_FLAG_*
-- Unused: VIEWPORT_WALL_FLAG_*
-- Unused: GraphicsRampType

<enum-type type-name='viewport_spatter_flag_fire' base-type='uint32_t'> bay12: VIEWPORT_FLAG_SPATTER_FIRE_*
<enum-item name='FRAME_1' value='1'/>
<enum-item name='FRAME_2' value='2'/>
<enum-item name='FRAME_4' value='3' comment='not a typo'/>
<enum-item name='FRAME_3' value='4' comment='not a typo'/>
</enum-type>

<bitfield-type type-name='viewport_spatter_flag' base-type='uint32_t'> bay12: VIEWPORT_SPATTER_FLAG_*
<flag-bit name='shape_type' original-name='SHAPE_TYPE' count='6'/>
<flag-bit name='material_type' original-name='MATERIAL_TYPE' count='5'/>
<flag-bit name='color_index_bits' original-name='COLOR_INDEX_BITS' count='8'/>
<flag-bit count='9' comment='unused'/>
<flag-bit name='fire_frame_type' type-name='viewport_spatter_flag_fire'
original-name='FIRE_FRAME' count='3'/>
<flag-bit name='accepts_spatter' original-name='ACCEPTS_SPATTER'/>
</bitfield-type>

-- Skipped: VIEWPORT_RAMP_FLAG_*
-- Skipped: VIEWPORT_SHADOW_FLAG_*

Expand All @@ -349,7 +367,7 @@
<pointer type-name='uint64_t' name='screentexpos_floor_flag' is-array='true'/> VIEWPORT_FLOOR_FLAG_*
<pointer type-name='int32_t' name='screentexpos_background_two' is-array='true' comment='boulder, plant, etc.'/>
<pointer type-name='uint32_t' name='screentexpos_liquid_flag' is-array='true'/> VIEWPORT_LIQUID_FLAG_*
<pointer type-name='uint32_t' name='screentexpos_spatter_flag' is-array='true'/> VIEWPORT_SPATTER_FLAG_*
<pointer type-name='viewport_spatter_flag' name='screentexpos_spatter_flag' is-array='true'/> VIEWPORT_SPATTER_FLAG_*
<pointer type-name='int32_t' name='screentexpos_spatter' is-array='true'/>
<pointer type-name='uint64_t' name='screentexpos_ramp_flag' is-array='true'/> VIEWPORT_RAMP_FLAG_*
<pointer type-name='uint32_t' name='screentexpos_shadow_flag' is-array='true'/> VIEWPORT_SHADOW_FLAG_*
Expand Down
Loading