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

Make vacollect a full class #267

Merged
merged 11 commits into from
Oct 22, 2023
+1,903 −1,872
Merged

Make vacollect a full class #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
79f7bc6
fold functions that reference vc into vacollect
no-lex Sep 10, 2023
72c3882
move vacollect from octarender.cpp > vacollect.cpp
no-lex Sep 11, 2023
eee92bd
move vacollect.cpp globals inside object
no-lex Sep 12, 2023
fee69da
move inline vacollect methods out of class definition
no-lex Sep 12, 2023
d76be62
remove dangling vacollect::origin field
no-lex Sep 12, 2023
55d5497
move va merge code into vacollect
no-lex Sep 13, 2023
68242b7
simplify sortkey::sort
no-lex Sep 17, 2023
8c78e46
use std::vector in vacollect::entstack
no-lex Sep 20, 2023
6029c87
const correct vacollect::gendecals()
no-lex Sep 20, 2023
473abb0
const correct genmergedfaces(), mergedface object
no-lex Sep 20, 2023
4ccad50
fold verthash into vacollect
no-lex Sep 25, 2023
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: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ add_library(primis SHARED
src/engine/render/stain.h
src/engine/render/texture.cpp
src/engine/render/texture.h
src/engine/render/vacollect.cpp
src/engine/render/vacollect.h
src/engine/render/water.cpp
src/engine/render/water.h
src/engine/world/bih.cpp
Expand Down
1 change: 1 addition & 0 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ CLIENT_OBJS= \
engine/render/shaderparam.o \
engine/render/stain.o \
engine/render/texture.o \
engine/render/vacollect.o \
engine/render/water.o \
engine/world/bih.o \
engine/world/dynlight.o \
Expand Down
Loading
Loading