mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up more shaders

Browse Source
This commit is contained in:
Alexander Bock
2015-05-20 11:28:51 +02:00
parent b8cd01ea4e
commit 154a949e8b
6 changed files with 24 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scene/scene.cpp
-36
View File
@@ -197,33 +197,6 @@ bool Scene::initialize() {
_programs.push_back(tmpProgram);
OsEng.ref().configurationManager()->setValue("nightTextureProgram", tmpProgram);
// Fov Program
tmpProgram = ProgramObject::Build("FovProgram",
"${SHADERS}/fov_vs.glsl",
"${SHADERS}/fov_fs.glsl");
if (!tmpProgram) return false;
tmpProgram->setProgramObjectCallback(cb);
_programs.push_back(tmpProgram);
OsEng.ref().configurationManager()->setValue("FovProgram", tmpProgram);
// Plane Program
tmpProgram = ProgramObject::Build("planeProgram",
"${SHADERS}/modules/plane/plane_vs.glsl",
"${SHADERS}/modules/plane/plane_fs.glsl");
if (!tmpProgram) return false;
tmpProgram->setProgramObjectCallback(cb);
_programs.push_back(tmpProgram);
OsEng.ref().configurationManager()->setValue("planeProgram", tmpProgram);
// Image Plane Program
tmpProgram = ProgramObject::Build("imagePlaneProgram",
"${SHADERS}/modules/imageplane/imageplane_vs.glsl",
"${SHADERS}/modules/imageplane/imageplane_fs.glsl");
if (!tmpProgram) return false;
tmpProgram->setProgramObjectCallback(cb);
_programs.push_back(tmpProgram);
OsEng.ref().configurationManager()->setValue("imagePlaneProgram", tmpProgram);
// RaycastProgram
tmpProgram = ProgramObject::Build("RaycastProgram",
"${SHADERS}/exitpoints.vert",
@@ -233,15 +206,6 @@ bool Scene::initialize() {
_programs.push_back(tmpProgram);
OsEng.ref().configurationManager()->setValue("RaycastProgram", tmpProgram);
// Grid program
tmpProgram = ProgramObject::Build("Grid",
"${SHADERS}/grid_vs.glsl",
"${SHADERS}/grid_fs.glsl");
if (!tmpProgram) return false;
tmpProgram->setProgramObjectCallback(cb);
_programs.push_back(tmpProgram);
OsEng.ref().configurationManager()->setValue("GridProgram", tmpProgram);
return true;
}