diff --git a/geotypes.cpp b/geotypes.cpp index 43c8b1c..26451a0 100644 --- a/geotypes.cpp +++ b/geotypes.cpp @@ -127,7 +127,7 @@ bool Ray::onRay(Punkt3D p, int rnd) { else if(g3) return (r1 == r2); else - return (r1 == r2 == r3); + return ((r1 == r2) == r3); } float Ray::dist(Punkt3D p) { @@ -215,7 +215,7 @@ bool Plane::collision(const Plane &p) const { } float Plane::dist(Punkt3D p) const { - + return 0.0f; } } // namespace segl diff --git a/model/model.cpp b/model/model.cpp index ddad10d..951a847 100644 --- a/model/model.cpp +++ b/model/model.cpp @@ -156,7 +156,7 @@ Model::~Model() { unload(); } -const Punkt3D* Model::getMeshData(unsigned int *meshanz) { +const Punkt3D* Model::getMeshData(unsigned int *meshanz) const { *meshanz = meshdataanz; return (const Punkt3D*)meshdata; } diff --git a/model/model.h b/model/model.h index 7c88ee6..fbdb716 100644 --- a/model/model.h +++ b/model/model.h @@ -84,10 +84,10 @@ class Model { void unload(); void render(); - Quader getBoundingBox() { return boundingbox; } - float getBoundingRad() { return boundingrad; } + Quader getBoundingBox() const { return boundingbox; } + float getBoundingRad() const { return boundingrad; } - const Punkt3D* getMeshData(unsigned int *meshanz); + const Punkt3D* getMeshData(unsigned int *meshanz) const; }; } // namespace segl