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.

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

Jump to bottom

Gamestate/renderer simulation #1497

Merged
merged 101 commits into from
Apr 2, 2023
Merged

Gamestate/renderer simulation #1497

merged 101 commits into from
Apr 2, 2023

Conversation

heinezen
Copy link
Member

@heinezen heinezen commented Feb 14, 2023 •
edited
Loading

Continues #1388 and integrates it into the new renderer architecture.

Resource loading

  • Introduce new .texture format for texture and subtexture definition
    • specification
    • converter export
  • Parsers for definition files
    • sprite
    • texture
    • terrain
    • blendmask
    • blendtable
    • palette
  • Storage classes
    • animation info
    • terrain info
    • blend info
    • palette info

Simulation

  • Simulation clock
  • Special curve for repeated time intervals
  • Event loop setup
    • pipeline from presenter to event loop
    • move events and clock to separate thread

Rendering

  • Play animations with corrects frame timings
  • Renderer test
    • parsing (demo 1)
    • displaying loaded texture (demo 1)
    • display animation (demo 4)
  • Use new formats in AssetManager/TextureManager
    • cache animation info
    • cache texture info
  • pass animations from gamestate to renderer

@heinezen heinezen added area: renderer Concerns our graphics renderer lang: c++ Done in C++ code area: simulation Involved in the game mechanics and simulation area: assets Involved with assets (images, sounds, ...) big stuff High-impact changes, mainly foundation work labels Feb 14, 2023
@heinezen heinezen marked this pull request as ready for review February 18, 2023 12:30
@heinezen heinezen mentioned this pull request Feb 19, 2023
Closed
10 tasks
@heinezen
renderer: Camera zoom level calibration.
e671881
@heinezen
render: Storage objects for .sprite format info.
5294985
@heinezen
render: Parse sprite format.
73e354c
@heinezen
doc: Add new '.texture' format definition.
f58e893 
Moves the subtexture information from the animation definition to its own format. This should make parsing the information easier.
@heinezen
doc: Adjust .terrain format and add more meta information to `.text…
fef785b 
…ure`.
@heinezen
render: Parse '.texture' format.
7f91da6
@heinezen
render: Store image path in Texture2dInfo.
9a128a6
@heinezen
export: Texture metadata format.
a576212
@heinezen
export: Create texture metadata files.
4cb81e0
@heinezen
render: Fix missing attributes in parser.
20a65fe
@heinezen
render: getter for image file path.
29c645e
@heinezen
render: Test texture parsing.
a3e5854
@heinezen
render: Fix sprite parser.
2cbcd6f
@heinezen
render: Test sprite parsing.
5b1af3d
@heinezen
convert: Use relative module imports.
9e2bca6
@heinezen
render: Test drawing texture from parsed animation file.
12fbb2a
@heinezen
export: Change the way the command bit is handled.
e3156a5 
Previously: Last Bit of alpha = 1 --> value is a command.
Now: Last Bit of alpha = 0 --> value is a command.

This makes rendering normal colors much easier, since their alphas can now be copied without a need for modification in the shader. alpha = 0 becomes a possible command as well.
@heinezen
render: Change filter for mangnifying to GL_NEAREST.
796814d
@heinezen
render: Improve animation parser demo.
a6bb969 
- Render subtexture with custom shader
- Add simple color command handling in fragmen shader
- Option to cycle through subtextures with left/right arrow keys
@heinezen
parser: Speedup parsing with constexpr maps for keywords and basic er…
d584464 
…ror handling.
@heinezen
render: Scale subtexture relative to texture size instead of window s…
b1972c1 
…ize.
@heinezen
render: Remove CSV metafile loading.
d416163
@heinezen heinezen linked an issue Mar 8, 2023 that may be closed by this pull request
Implement a parser for the new sprite format #1055
Closed
This was referenced Mar 9, 2023
Open
Closed
TheJJ
TheJJ approved these changes Apr 2, 2023
View reviewed changes
Copy link
Member

@TheJJ TheJJ left a comment

Choose a reason for hiding this comment

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

lets do it!

@TheJJ TheJJ merged commit d25db78 into SFTtech:master Apr 2, 2023
This was referenced Apr 2, 2023
Closed
Closed
This was referenced Sep 8, 2023
Closed
Closed
@heinezen heinezen deleted the animated-simulation branch October 15, 2023 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheJJ TheJJ TheJJ approved these changes

Assignees
No one assigned
Labels
area: assets Involved with assets (images, sounds, ...) area: renderer Concerns our graphics renderer area: simulation Involved in the game mechanics and simulation big stuff High-impact changes, mainly foundation work lang: c++ Done in C++ code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement a parser for the new sprite format
2 participants
@heinezen @TheJJ