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

Graphics/imgui #47

Merged
merged 107 commits into from
Jul 27, 2023
Merged

Graphics/imgui #47

merged 107 commits into from
Jul 27, 2023

Conversation

AlemSnyder
Copy link
Owner

No description provided.

@AlemSnyder
data, shaders
f4bf32c
@AlemSnyder
make render dir
7ca4afc
@AlemSnyder
background works
cb27b55
@AlemSnyder
stars work
56c4b7c
@AlemSnyder
ues radians
ce12859
@AlemSnyder
round stars
9e5dd6d
@AlemSnyder
scaled correctly
eaa4fdf
@AlemSnyder
Moved data files to data folder
4f7b8bd
@AlemSnyder
comments
88d8e1d
@AlemSnyder
Merge branch next main into GUI/SkyBackground
5d2c564
@AlemSnyder
why does this break?
19d5968
@AlemSnyder
fixed mismatched names to shader
d72eb6c
@AlemSnyder
more standard radial coordinates
8c4ad24
@AlemSnyder
star color
65aaf2e
@AlemSnyder
add imgui
a81ab06
@AlemSnyder
extant test
8e375af
@AlemSnyder
moved terrain mesh handlers to world
fcd46ee
@AlemSnyder
update terrain while running
a3554c2
@AlemSnyder
meshes are pointers
455260d
@AlemSnyder
Merge branch 'refactoring/terrain' into mesh_edit
40aaf28
@AlemSnyder
add random number generator for stars
0a0413e
@AlemSnyder
removed init, copy operators from terrain mesh
fe3ca5b
@AlemSnyder
init to update
1c1678a
@AlemSnyder
Merge branch 'mesh_edit' of https://github.com/AlemSnyder/Fun-Game in…
b7fad75 
…to mesh_edit
@AlemSnyder
Merge branch 'refactoring/terrain' into GUI/SkyBackground2
99c8b5e
@AlemSnyder
This should have been in the last one
946880b
@AlemSnyder
renaming, and better file placement
fa512cd
@AlemSnyder
Merge branch 'main' into mesh_edit
53d3263
@AlemSnyder
This should have been in the last commit
9101a50
@AlemSnyder
formatting
94e4714
@egelja
Copy link
Collaborator

egelja commented Jul 5, 2023

Clang-format everything first

egelja
egelja reviewed Jul 5, 2023
View reviewed changes
make_stars.py Outdated Show resolved Hide resolved
egelja
egelja reviewed Jul 5, 2023
View reviewed changes
.gitignore Outdated Show resolved Hide resolved
egelja
egelja reviewed Jul 5, 2023
View reviewed changes
CMakeLists.txt Outdated Show resolved Hide resolved
@egelja egelja self-requested a review July 23, 2023 15:10
egelja
egelja requested changes Jul 23, 2023
View reviewed changes
Copy link
Collaborator

@egelja egelja left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good, code is getting much cleaner. Other than the review comments, here are a couple little things I'd like changed

  • The function Mesh::generate_mesh is 161 LOC, with a cyclomatic complexity of 21. Most linters warn when you get to 10. It would be good to refactor that function into multiple smaller ones. Refactoring #50
  • ui::imguiTest is too long. While it isn't complex, its hard to follow. Would be nicer if you broke it up into multiple functions.

make_stars.py Outdated Show resolved Hide resolved
resources/shaders/ShadowMappingInstanced.vert Outdated Show resolved Hide resolved
resources/shaders/SimpleTexture.frag Outdated Show resolved Hide resolved
resources/shaders/SimpleTextureMS.frag Outdated Show resolved Hide resolved
resources/shaders/SimpleTextureMS.frag Outdated Show resolved Hide resolved
src/gui/ui/main_ui.hpp Outdated Show resolved Hide resolved
src/logging.cpp Outdated Show resolved Hide resolved
src/logging.cpp Outdated Show resolved Hide resolved
src/terrain/path/tile_iterators.hpp Outdated Show resolved Hide resolved
src/terrain/terrain.cpp Outdated Show resolved Hide resolved
egelja
egelja requested changes Jul 24, 2023
View reviewed changes
src/entity/mesh.hpp Outdated Show resolved Hide resolved
src/gui/data_structures/frame_buffer_multisample.cpp Outdated Show resolved Hide resolved
src/gui/handler.cpp Show resolved Hide resolved
src/gui/render/quad_renderer.cpp Outdated Show resolved Hide resolved
src/gui/render/renderer.cpp Outdated Show resolved Hide resolved
src/gui/scene/main_gui.cpp Outdated Show resolved Hide resolved
src/gui/scene/scene.cpp Outdated Show resolved Hide resolved
src/main.cpp Outdated Show resolved Hide resolved
src/terrain/terrain.cpp Outdated Show resolved Hide resolved
src/terrain/terrain.cpp Show resolved Hide resolved
egelja
egelja approved these changes Jul 27, 2023
View reviewed changes
Copy link
Collaborator

@egelja egelja left a comment

Choose a reason for hiding this comment

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

LGTFM

@AlemSnyder AlemSnyder merged commit 959dcf8 into main Jul 27, 2023
@AlemSnyder AlemSnyder deleted the Graphics/imgui branch July 27, 2023 02:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@egelja egelja egelja approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AlemSnyder @egelja