diff --git a/glcamera.cpp b/glcamera.cpp index 263524c..64c108c 100644 --- a/glcamera.cpp +++ b/glcamera.cpp @@ -36,6 +36,11 @@ void GLCamera::setCamera() { // glTranslateP3D(-pos); } +void GLCamera::setPosDirNorm(Punkt3D p, Punkt3D d, Punkt3D n) { + pos = p; + dir = d.getNormalized(); + norm = n.getNormalized(); +} // Move-Funktionen @@ -170,6 +175,10 @@ void GLCamera::renderCoord() { glEnd(); } +Punkt3D GLCamera::getPos() { + return pos; +} + GLCamera::~GLCamera() { } diff --git a/glcamera.h b/glcamera.h index 3bea881..7119715 100644 --- a/glcamera.h +++ b/glcamera.h @@ -33,6 +33,7 @@ class GLCamera { // GLCamera(Punkt3d void setCamera(); + void setPosDirNorm(Punkt3D p, Punkt3D D, Punkt3D n); // Std Move void moveForward(float sec); @@ -51,6 +52,7 @@ class GLCamera { void print(); void renderCoord(); + Punkt3D getPos(); ~GLCamera(); }; diff --git a/glfontengine.cpp b/glfontengine.cpp index b5d0185..7785d3f 100644 --- a/glfontengine.cpp +++ b/glfontengine.cpp @@ -10,7 +10,7 @@ bool GLFontEngine::addFont(std::string fontfile, std::string fontname) { } fontpool[fontname] = tmp; - return false; + return true; } void GLFontEngine::quit() { @@ -124,7 +124,7 @@ void GLFontEngine::renderLine(std::string text, SDL_Rect pos) { for(unsigned int i=0; icharwidth*fsize>wrap) { diff --git a/glmenu/menumenu.h b/glmenu/menumenu.h index de7a0ff..ef1b5fa 100644 --- a/glmenu/menumenu.h +++ b/glmenu/menumenu.h @@ -21,6 +21,10 @@ class MenuMenu { int maxwidth; int valuewidth; GLFontEngine fontengine; + + // Soll anderes center evtl. ersetzen + // TODO: cleanup + bool fullcenter; public: MenuMenu(); diff --git a/glsdlscreen.cpp b/glsdlscreen.cpp index 3a06d75..2d612fa 100644 --- a/glsdlscreen.cpp +++ b/glsdlscreen.cpp @@ -109,6 +109,7 @@ bool GLSDLScreen::apply() { glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); glEnable(GL_ALPHA_TEST); glAlphaFunc(GL_GREATER, 0.1); + glEnable(GL_DEPTH_TEST); } // Projection @@ -124,7 +125,7 @@ bool GLSDLScreen::apply() { - // Texturen neuladen, eigentlich nur für Windows. Aber egal. + // Texturen neuladen, eigentlich nur f�r Windows. Aber egal. GLTexture::reloadAll(); glMatrixMode(GL_TEXTURE); glLoadIdentity(); diff --git a/glsdlscreen.h b/glsdlscreen.h index 7d02fda..3ffa365 100644 --- a/glsdlscreen.h +++ b/glsdlscreen.h @@ -16,6 +16,7 @@ class GLSDLScreen { bool resizable; bool fullscreen; + // OpenGL related float znear, zfar; void (*extraglparam)(); diff --git a/model/loadobj.h b/model/loadobj.h index cd0ab07..af9dbe2 100644 --- a/model/loadobj.h +++ b/model/loadobj.h @@ -1,6 +1,7 @@ #ifndef __LOADOBJ_H #define __LOADOBJ_H +#include #include "modelloader.h" #include "model.h" #include "../extstring.h"