mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
GLSL 'include' support
This commit is contained in:
parent
e6ecd558a9
commit
a60cc70246
20 changed files with 238 additions and 35 deletions
|
|
@ -15,6 +15,7 @@
|
|||
#include "window/Camera.h"
|
||||
#include "window/input.h"
|
||||
#include "graphics/Batch2D.h"
|
||||
#include "graphics/Shader.h"
|
||||
#include "graphics/ImageData.h"
|
||||
#include "frontend/gui/GUI.h"
|
||||
#include "frontend/screens.h"
|
||||
|
|
@ -22,6 +23,7 @@
|
|||
|
||||
#include "coders/json.h"
|
||||
#include "coders/png.h"
|
||||
#include "coders/GLSLExtension.h"
|
||||
#include "files/files.h"
|
||||
#include "files/engine_paths.h"
|
||||
|
||||
|
|
@ -35,6 +37,7 @@ using gui::GUI;
|
|||
Engine::Engine(EngineSettings& settings, EnginePaths* paths, Content* content)
|
||||
: settings(settings), content(content), paths(paths) {
|
||||
Window::initialize(settings.display);
|
||||
Shader::preprocessor->setLibFolder(paths->getResources()/path("shaders/lib"));
|
||||
|
||||
assets = new Assets();
|
||||
std::cout << "-- loading assets" << std::endl;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue