* Assemble through `gcc` instead of `as` directly, so source files are
preprocessed (i.e., `#include`)
* `gcc` does not pass `-I` include directories to `as`. This can
supposedly be fixed by recompiling `gcc` with `--with-gnu-as`. Popular
N64 toolchain binary distributions don't do this, and to lower the
barrier to entry I don't want to force users to have to compile their
own. Work around it by passing `-Wa,-I`.
* CMake only finds assembly dependencies when preprocessing, not when
assembling. Use `#include` instead of `.include` to work around this.
The `.incbin`s used by `sound_data.s` are covered by the
sound_data_tables target dependency.
Previously, grav_flare was used (likely due to a copy/paste error),
resulting in a warning during build and unnecessary texture data
being included in the fleck_ash2 generated model.
* When building with CMake, dynamic model lists are now generated
* Factored common code out of generate_*_list.js files to deduplicate
* Better separated generated model lists from main game code
`dynamic_asset_data.c` and `dynamic_animated_asset_data.c`
previously #included the corresponding generated headers, and
`dynamic_asset_loader.c` declared externs for the contents.
This messiness was likely done so the generated code would be built
automatically (the Makefile globs all C files under `src/`).
Now, model list data is output to C source files which are built
explicitly. This, with some refactoring, allows the previously
mentioned source files and externs to be removed.
This is a bit hacky in the Makefile but will be automatic under
CMake by using target properties.
* Reorganized some files under `tools/`
With CMake, the game version is stored in a generated header file so
dependencies on it are kept track of automatically.
The game now compiles when using CMake but does not link.
Generated code dependencies are not hooked up yet and corresponding
targets need to be built manually.
Incidental changes along the way:
* Move `export_level.lua` to `tools/level_scripts/`
* Small reorganizations/fixes to existing `CMakeLists.txt` files
* Support passing absolute paths to level export
Some parts need to be cleaned up/removed/streamlined after the CMake
build can build the game on its own and compatibility with what the
old makefile does is no longer needed.
It is still necessary to special case extracting the raw WAV from the
video, but now conversion is handled using a .sox file just like the
other sounds.
This simplifies sound processing for the CMake transition.
To better organize generated files, portal_pak_modified/ will be used
for files generated by modifying portal_pak_dir/ contents.
Build/ will be for conversion to a final form needed for compilation,
without content modification.
* started on chamber 15
* fizzler width can now be scaled via blender object's scale.x
* fix fizzler rendering radius (remember, fizzlers are per default 2x2, still their internal width height was 1x1?)
* chamber 15 first room functionally complete
* chamber 15: first room decor
* finished first room of chamber 15
* test chamber 15 second room WIP
* chamber15 hallway from room 2 to room 3 (WIP) and more progress on room 2
* test chamber 15: added observation room to room2, added voice lines add the beginning
* test chamber 15: finishing room 2
* enable "new game" menu entry for chamber 15 & boot into the intro menu again instead of straight into chamber 15
* Start on shamber 15 hazard hallway
Hallway is modeled with collision. No platforms.
* Decals and platform + light cutouts for chamber 15 hazard hallway
* Animate one moving platform in chamber 15 hazard hallway
This one animation is ~19 KB. Look at optimizing.
* Add material for water hazard wall
* Use water hazard wall material in chamber 15
* Start modelling final room of chamber 15
* Chamber 15 final room - side rooms
* Chamber 15 final room - pistons and exit
* Chamber 15 final room - observation room
* Chamber 15 final room - ball launcher and catcher
* Chamber 15 final room - ball trap and indicator lights
* Chamber 15 final room - ball trap doors
* Chamber 15 final room - collision
* Chamber 15 final room - animations and triggers
* Chamber 15 - escape hatch
* Chamber 15 - finish final room
* Chamber 15 - start on room 3
* Chamber 15 - main room 3 layout and collision
* Fix UV translation
Do not translate minimum coordinates, otherwise the translation will be
cancelled out.
* Chamber 15 - room 3 stair room
* Chamber 15 - room 3 dividers and ball launcher/catcher
* Chamber 15 - room 3 finishing touches
* Observation room decor
* Triggers
* Indicator lights
* Decals
* Chamber 15 - merge beginning and end
* Chamber 15 - fix room boundaries
---------
Co-authored-by: Deconimus <pascal.sielski@gmx.de>
Co-authored-by: Deconimus <Deconimus@users.noreply.github.com>
