Skip to content
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.

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

Add painting objects + convert vanilla paintings into objects #445

Open
wants to merge 114 commits into
base: develop/3.0.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
e176d80
Add painting objects + convert vanilla paintings into objects
Arceveti Jul 6, 2022
76809f5
Fix missing floor behind DDD painting
Arceveti Jul 6, 2022
b340408
Merge branch 'develop/2.1.0' into develop/2.1.0-painting-objects
Arceveti Jul 6, 2022
0ff4147
Rename 'sPaintingEjectSoundPlayed' to 'gPaintingEjectSoundPlayed'
Arceveti Jul 19, 2022
786a569
Revert formatting change in 'cutscene_exit_painting'
Arceveti Jul 19, 2022
d755fb4
Make normalize_component return s8 instead of casting
Arceveti Jul 19, 2022
d118c79
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Aug 4, 2022
6e9df1f
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Aug 9, 2022
57d7529
Allow paintings to use 32 vertex buffer + optimization + formatting
Arceveti Aug 9, 2022
e2c0fe0
Combine duplicate painting texture map data and move it to segment2
Arceveti Aug 9, 2022
d750366
Combine ripple setup dls + paintings.c gfx commands formatting + use …
Arceveti Aug 10, 2022
da9e796
Move ripple constants outside of Painting struct
Arceveti Aug 10, 2022
ee96ec7
Remove extra newline
Arceveti Aug 10, 2022
f9cbf8f
Use defines for fake CCM paintings' coords
Arceveti Aug 10, 2022
168293d
Some paintings.c refactoring
Arceveti Aug 10, 2022
5e992b5
Revert change that was using unimplemented functionality in geo_paint…
Arceveti Aug 10, 2022
df051e3
Partially update main paintings.c comment + more formatting
Arceveti Aug 11, 2022
c330431
Rename 'commands' to 'gfxCmds'
Arceveti Aug 11, 2022
d1b0bad
Automatic texture maps & non-rippling display lists for paintings
Arceveti Aug 14, 2022
7fe7f6b
Fix tiny seam between painting segments
Arceveti Aug 16, 2022
4b651cc
Clean up painting texel calculations
Arceveti Aug 16, 2022
fc093b9
Add get_exponent for painting texture setup + dl_painting_not_ripplin…
Arceveti Aug 17, 2022
5ea50a7
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Sep 29, 2022
c7115d4
Fix seams between painting sections on console
Arceveti Sep 29, 2022
12e6c85
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Sep 29, 2022
8e6b625
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Oct 1, 2022
d7b63e8
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Oct 4, 2022
2222429
Fix ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS comment + Undo removal of tr…
Arceveti Oct 8, 2022
a6676ef
Revert some formatting changes in camera.c
Arceveti Oct 8, 2022
3ea3c1f
Change painting object data pointer to const void
Arceveti Oct 10, 2022
d08afde
Rename 'gRipplingPainting' to 'gRipplingPaintingObject' and 'gEntered…
Arceveti Oct 21, 2022
11fb037
Fix RR painting using the wrong ID
Arceveti Oct 21, 2022
e9dd494
Fix painting object field offsets
Arceveti Nov 3, 2022
69330d3
fix SurfaceClass enum
Arceveti Nov 8, 2022
c78624d
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Nov 8, 2022
ab9f327
Rename 'resetTimer' arg to 'doResetTimer' in painting_state
Arceveti Nov 8, 2022
d4c7a58
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Nov 28, 2022
590084f
Remove reset_painting and NO_SEGMENTED_MEMORY ifdef
Arceveti Dec 5, 2022
656c72a
Remove SAVE_FLAG_DDD_MOVED_BACK + allow paintings to move during some…
Arceveti Dec 5, 2022
e3243cb
Add PAINTING_VERTEX macro for painting triangle mesh
Arceveti Dec 5, 2022
171d08d
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Dec 6, 2022
a1ec042
Paintings use regular object warp nodes + remove painting groups + pa…
Arceveti Dec 9, 2022
2436072
Move painting functionality except for rendering into bhv_painting_lo…
Arceveti Dec 10, 2022
2988324
Improve painting texture map names + change imageCount check to switch
Arceveti Dec 10, 2022
f98b8b8
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Dec 10, 2022
3c17702
Remove gRipplingPaintingObject + clean up painting eject sound
Arceveti Dec 10, 2022
be32943
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Dec 10, 2022
578e70e
RippleAnimationInfo struct changes
Arceveti Dec 10, 2022
16ebce4
Rename 'oPaintingRippleX' and 'oPaintingRippleY' to 'oPaintingRippleP…
Arceveti Dec 10, 2022
5d12ebf
Make WDW water level detextion relative to the painting instead of ab…
Arceveti Dec 10, 2022
eed1293
Replace gEnteredPaintingObject with a MarioState field
Arceveti Dec 10, 2022
a73531a
small changes
Arceveti Dec 11, 2022
508fe39
Make 'sPaintingMesh' and 'sPaintingTriNorms' into local variables
Arceveti Dec 12, 2022
d63bb4d
skip s16 conversion for ripple magnitude
Arceveti Dec 12, 2022
f396d89
Rename 'oPaintingData' to 'oPaintingImageInfo'
Arceveti Dec 12, 2022
2d23771
Painting UV cleanup
Arceveti Dec 12, 2022
e27ba77
Make PaintingState enum names clearer
Arceveti Dec 12, 2022
66828da
Rename some structs
Arceveti Dec 12, 2022
11d7f84
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Dec 12, 2022
1d2c50e
Remove unused gsSPLightColor commands in dl_paintings_env_mapped_begin
Arceveti Dec 12, 2022
ec318df
Fix some comments in paintings.h
Arceveti Dec 12, 2022
d19ec64
use oAction instead of oPaintingState
Arceveti Dec 12, 2022
04d8321
Make some function names clearer
Arceveti Dec 12, 2022
0b6417a
Remove 'oPaintingChangedFlags' + rename some object fields & enums
Arceveti Dec 12, 2022
c97839c
Replace 'oPaintingLocalMarioPosX' and 'oPaintingLocalMarioPosY' with …
Arceveti Dec 12, 2022
9cee1ee
Smaller PAINTING_EDGE_MARGIN
Arceveti Dec 12, 2022
1ed0a72
rr_painting uses RIPPLE_TRIGGER_NONE
Arceveti Dec 13, 2022
a5df7ff
Add PAINTING_WOBBLE_WARP_THRESHOLD + Change paintings.h defines to us…
Arceveti Dec 14, 2022
33d7f63
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Dec 14, 2022
4fe3d3f
Remove redundant painting data from segment2.c
Arceveti Dec 14, 2022
9aab0fd
Rename 'painting_data_mesh' to 'painting_data_vertices'
Arceveti Dec 14, 2022
dbfb89d
Update some variable names
Arceveti Dec 14, 2022
98a413a
Fix some typos/formatting
Arceveti Dec 14, 2022
aaa2250
Automatically determine neighboring triangles for each vertex instead…
Arceveti Dec 14, 2022
09ca176
Rename 'PaintingIDs' to 'PaintingImageIDs'
Arceveti Dec 14, 2022
be58ea7
WARP_DEST_LEVEL_NUM_MASK Usage
Arceveti Dec 15, 2022
23ea8b0
Add PAINTING_IMAGE_TYPE_INVISIBLE + format PaintingImage structs
Arceveti Dec 15, 2022
3a526ef
Center scaled paintings during cutscenes
Arceveti Dec 15, 2022
be01f6c
Use object scale as painting scale instead of painting_model_view_tra…
Arceveti Dec 16, 2022
0421011
Clean up non-rippling painting dl
Arceveti Dec 16, 2022
bb5ad78
Formatting changes :)
Arceveti Dec 16, 2022
f0509d4
Don't use PAINTING_SIZE for fake CCM paintings
Arceveti Dec 16, 2022
bfdae60
Painting scale changes
Arceveti Jan 6, 2023
cc683d2
'vec3f_local_pos_to_world_pos' and 'vec3f_world_pos_to_local_pos' doc…
Arceveti Jan 14, 2023
d5b4190
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Jan 26, 2023
16fdf62
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Jan 26, 2023
9e30c86
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Feb 11, 2023
2c52e06
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Mar 7, 2023
643e6a7
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Mar 17, 2023
4744c9c
Remove unused externs
Arceveti Mar 17, 2023
8a05475
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Mar 27, 2023
199486a
improve gfx allocation (formatting) + add gsLoadBlockTexture
Arceveti Mar 28, 2023
5f694b9
pointer formatting changes
Arceveti Apr 7, 2023
33b7055
Fix arg formatting in painting_calculate_triangle_normals
Arceveti Apr 10, 2023
41dc721
initiate_painting_warp pointer formatting
Arceveti Apr 10, 2023
dc0d6c6
_Bool/enum usage
Arceveti Apr 16, 2023
b518acf
use _Bool for 'shaded'
Arceveti Apr 26, 2023
1e0e680
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti May 1, 2023
17e4f7b
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Jul 12, 2023
a4e2977
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Aug 24, 2023
117ae73
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Sep 2, 2023
e02659d
Improve painting struct definitions
Arceveti Sep 2, 2023
bd83b07
Some documentation + add IEEE754 unions + formatting
Arceveti Sep 7, 2023
941207b
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Sep 11, 2023
3731f92
Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Sep 22, 2023
fa3fc8d
Merge branch 'master' of https://github.com/Reonu/HackerSM64 into dev…
Arceveti Sep 26, 2023
1fb29f9
Merge branch 'master' of https://github.com/Reonu/HackerSM64 into dev…
Arceveti Sep 27, 2023
0761d2f
Fix(?) painting warp checkpoints
Arceveti Sep 27, 2023
1fe6bc0
Merge branch 'develop/2.1.2' of https://github.com/Reonu/HackerSM64 i…
Arceveti Sep 27, 2023
e6c6a8b
Move segment2 paintings data to paintings.c.in
Arceveti Sep 28, 2023
95b21c5
Merge branch 'master' of https://github.com/Reonu/HackerSM64 into dev…
Arceveti Dec 15, 2023
c4d0df7
Merge branch 'develop/2.2.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Dec 15, 2023
88ac68b
Merge branch 'develop/2.2.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Feb 14, 2024
882c9d7
Merge branch 'develop/2.3.0' of https://github.com/Reonu/HackerSM64 i…
Arceveti Mar 30, 2024
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
- **Fazana**: PuppyLib, ucode swapping, audio load time optimisations (with Arctic), general hacker qol improvements, visual debug
- **Reonu**: Starting the project/repo, widescreen, reonucam, various defines for hacker QoL
- **JoshDuMan**: Decomp guy, general assistance
- **Arceveti**: Silhouette, shadow optimisation, better hanging, breath meter
- **Arceveti**: Silhouette, shadow optimizations, better hanging, breath meter, painting objects, implementation of frameperfection's rounded corners fix, naming most unknowns, various hacker QOL improvements, and various optimizations/fixes
Arceveti marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bit lengthy, but honestly we should be refactoring the README as a whole pretty shortly IMO. It's frankly a mess.

- **axollyon**: Console testing, bugfixes, idea-guying, and had a hand in silhouettes
- **Wiseguy**: World scale reimplementation, silhouette, graph node optimisations, instant input patch, cake screen fix, segmented code support, and various optimizations/fixes
- **Kaze**: Graph node optimisations, automatic optimal collision distance
Expand Down
3 changes: 3 additions & 0 deletions actors/common1.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ extern const Gfx mushroom_1up_seg3_dl_0302A660[];
// number
extern const GeoLayout number_geo[];

// painting
extern const GeoLayout painting_geo[];

// pebble
extern const Gfx pebble_seg3_dl_0301CB00[];

Expand Down
1 change: 1 addition & 0 deletions actors/common1_geo.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "leaves/geo.inc.c"
#include "mario_cap/geo.inc.c"
#include "number/geo.inc.c"
#include "painting/geo.inc.c"
#include "mushroom_1up/geo.inc.c"
#include "star/geo.inc.c"
#include "dirt/geo.inc.c"
Expand Down
9 changes: 9 additions & 0 deletions actors/painting/geo.inc.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include "game/paintings.h"

const GeoLayout painting_geo[] = {
GEO_CULLING_RADIUS(2000),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_END(),
};
Loading