Merge branch 'vacollect' into 'main'

project-imprimis · Oct 22, 2023 · f3b29ad · f3b29ad
2 parents efd5139 + 4ccad50
commit f3b29ad
Show file tree

Hide file tree

Showing 7 changed files with 1,903 additions and 1,873 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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

diff --git a/src/Makefile b/src/Makefile
@@ -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 \