Bug fixes

src/cln/CollisionShape.h

@@ -13,21 +13,21 @@ class CollisionShape
 {
 	public:
 		/// Collision shape type
-		enum ClassId
+		enum CollisionShapeType
 		{
-			CID_LINE_SEG,
-			CID_RAY,
-			CID_PLANE,
-			CID_SPHERE,
-			CID_AABB,
-			CID_OBB
+			CST_LINE_SEG,
+			CST_RAY,
+			CST_PLANE,
+			CST_SPHERE,
+			CST_AABB,
+			CST_OBB
 		};
 
-		CollisionShape(ClassId cid_)
+		CollisionShape(CollisionShapeType cid_)
 		:	cid(cid_)
 		{}
 
-		ClassId getClassId() const
+		CollisionShapeType getCollisionShapeType() const
 		{
 			return cid;
 		}
@@ -38,7 +38,7 @@ class CollisionShape
 		virtual float testPlane(const Plane&) const = 0;
 
 	private:
-		ClassId cid;
+		CollisionShapeType cid;
 };
 /// @}
 

src/cln/LineSegment.h

@@ -15,7 +15,7 @@ class LineSegment: public CollisionShape
 	public:
 		/// @name Constructors
 		/// @{
-		LineSegment(): CollisionShape(CID_LINE_SEG) {}
+		LineSegment(): CollisionShape(CST_LINE_SEG) {}
 		LineSegment(const Vec3& origin, const Vec3& direction);
 		LineSegment(const LineSegment& b);
 		/// @}
@@ -42,14 +42,14 @@ class LineSegment: public CollisionShape
 
 
 inline LineSegment::LineSegment(const Vec3& origin_, const Vec3& direction)
-:	CollisionShape(CID_LINE_SEG),
+:	CollisionShape(CST_LINE_SEG),
 	origin(origin_),
 	dir(direction)
 {}
 
 
 inline LineSegment::LineSegment(const LineSegment& b)
-:	CollisionShape(CID_LINE_SEG),
+:	CollisionShape(CST_LINE_SEG),
 	origin(b.origin),
 	dir(b.dir)
 {}

src/cln/Obb.h

@@ -15,7 +15,7 @@ class Obb: public CollisionShape
 	public:
 		/// @name Constructors
 		/// @{
-		Obb(): CollisionShape(CID_OBB) {}
+		Obb(): CollisionShape(CST_OBB) {}
 		Obb(const Obb& b);
 		Obb(const Vec3& center, const Mat3& rotation, const Vec3& extends);
 		/// @}
@@ -57,7 +57,7 @@ class Obb: public CollisionShape
 
 
 inline Obb::Obb(const Obb& b)
-:	CollisionShape(CID_OBB),
+:	CollisionShape(CST_OBB),
 	center(b.center),
 	rotation(b.rotation),
 	extends(b.extends)
@@ -66,7 +66,7 @@ inline Obb::Obb(const Obb& b)
 
 inline Obb::Obb(const Vec3& center_, const Mat3& rotation_,
 	const Vec3& extends_)
-:	CollisionShape(CID_OBB),
+:	CollisionShape(CST_OBB),
 	center(center_),
 	rotation(rotation_),
 	extends(extends_)

src/cln/Plane.h

@@ -17,7 +17,7 @@ class Plane: public CollisionShape
 		/// @{
 
 		/// Default constructor
-		Plane(): CollisionShape(CID_PLANE) {}
+		Plane(): CollisionShape(CST_PLANE) {}
 
 		/// Copy constructor
 		Plane(const Plane& b);
@@ -73,28 +73,28 @@ class Plane: public CollisionShape
 
 
 inline Plane::Plane(const Plane& b)
-:	CollisionShape(CID_PLANE),
+:	CollisionShape(CST_PLANE),
 	normal(b.normal),
 	offset(b.offset)
 {}
 
 
 inline Plane::Plane(const Vec3& normal_, float offset_)
-:	CollisionShape(CID_PLANE),
+:	CollisionShape(CST_PLANE),
 	normal(normal_),
 	offset(offset_)
 {}
 
 
 inline Plane::Plane(const Vec3& p0, const Vec3& p1, const Vec3& p2)
-:	CollisionShape(CID_PLANE)
+:	CollisionShape(CST_PLANE)
 {
 	setFrom3Points(p0, p1, p2);
 }
 
 
 inline Plane::Plane(float a, float b, float c, float d)
-:	CollisionShape(CID_PLANE)
+:	CollisionShape(CST_PLANE)
 {
 	setFromPlaneEquation(a, b, c, d);
 }

src/cln/Ray.h

@@ -19,7 +19,7 @@ class Ray: public CollisionShape
 		/// @{
 
 		/// Default constructor
-		Ray(): CollisionShape(CID_RAY) {}
+		Ray(): CollisionShape(CST_RAY) {}
 
 		/// Copy constructor
 		Ray(const Ray& other);
@@ -48,14 +48,14 @@ class Ray: public CollisionShape
 
 
 inline Ray::Ray(const Ray& other)
-:	CollisionShape(CID_RAY),
+:	CollisionShape(CST_RAY),
 	origin(other.origin),
 	dir(other.dir)
 {}
 
 
 inline Ray::Ray(const Vec3& origin_, const Vec3& direction_)
-:	CollisionShape(CID_RAY),
+:	CollisionShape(CST_RAY),
 	origin(origin_),
 	dir(direction_)
 {}

src/cln/Sphere.h

@@ -20,7 +20,7 @@ class Sphere: public CollisionShape
 		/// @{
 
 		/// Default constructor
-		Sphere(): CollisionShape(CID_SPHERE) {}
+		Sphere(): CollisionShape(CST_SPHERE) {}
 
 		/// Copy constructor
 		Sphere(const Sphere& other);
@@ -56,14 +56,14 @@ class Sphere: public CollisionShape
 
 
 inline Sphere::Sphere(const Sphere& b)
-:	CollisionShape(CID_SPHERE),
+:	CollisionShape(CST_SPHERE),
 	center(b.center),
 	radius(b.radius)
 {}
 
 
 inline Sphere::Sphere(const Vec3& center_, float radius_)
-:	CollisionShape(CID_SPHERE),
+:	CollisionShape(CST_SPHERE),
 	center(center_),
 	radius(radius_)
 {}

src/core/AsyncLoader.h

@@ -62,8 +62,6 @@ class AsyncLoader
 			bool ok; ///< True if the loading was successful
 		};
 
-		SDL_GLContext glContext; ///< For OpenGL stuff
-
 		std::list<Request> requests;
 		std::list<Response> responses;
 		boost::mutex mutexReq; ///< Protect the requests container

src/r/Dbg.cpp

@@ -273,10 +273,10 @@ void Dbg::run()
 	BOOST_FOREACH(const SceneNode* node,
 		SceneSingleton::get().getAllNodes())
 	{
-		/*if(!node->isVisible())
+		if(!node->isFlagEnabled(SceneNode::SNF_VISIBLE))
 		{
 			continue;
-		}*/
+		}
 
 
 		switch(node->getSceneNodeType())

src/r/Is.cpp

@@ -254,14 +254,11 @@ void Is::spotLightPass(const SpotLight& light)
 	shdr->bind();
 
 	// bind the FAIs
-	shdr->getUniformVariableByName("msNormalFai").set(
-		r.getMs().getNormalFai(), 0);
-	shdr->getUniformVariableByName("msDiffuseFai").set(
-		r.getMs().getDiffuseFai(), 1);
-	shdr->getUniformVariableByName("msSpecularFai").set(
-		r.getMs().getSpecularFai(), 2);
-	shdr->getUniformVariableByName("msDepthFai").set(
-		r.getMs().getDepthFai(), 3);
+	const Ms& ms = r.getMs();
+	shdr->getUniformVariableByName("msNormalFai").set(ms.getNormalFai(), 0);
+	shdr->getUniformVariableByName("msDiffuseFai").set(ms.getDiffuseFai(), 1);
+	shdr->getUniformVariableByName("msSpecularFai").set(ms.getSpecularFai(), 2);
+	shdr->getUniformVariableByName("msDepthFai").set(ms.getDepthFai(), 3);
 
 	// the ???
 	shdr->getUniformVariableByName("planes").set(&r.getPlanes());
@@ -352,7 +349,7 @@ void Is::run()
 	{
 		pointLightPass(*light);
 	}
-	
+
 	BOOST_FOREACH(const SpotLight* light, r.getCamera().getVisibleSpotLights())
 	{
 		spotLightPass(*light);

src/r/Smo.cpp

@@ -67,6 +67,7 @@ void Smo::initCamGeom()
 {
 	boost::array<const char*, Camera::CT_NUM> files = {{
 		"engine-rsrc/pyramid.mesh", "engine-rsrc/cube.mesh"}};
+	ASSERT(Camera::CT_PERSPECTIVE == 0);
 
 	for(uint i = 0; i < Camera::CT_NUM; i++)
 	{

src/rsrc/ResourceManager.cpp

@@ -48,7 +48,7 @@ ResourceManager::~ResourceManager()
 
 
 
-//SPECIALIZE_TEMPLATE_STUFF(Texture, textures)
+SPECIALIZE_TEMPLATE_STUFF(Texture, textures)
 SPECIALIZE_TEMPLATE_STUFF(ShaderProgram, shaderProgs)
 SPECIALIZE_TEMPLATE_STUFF(Material, materials)
 SPECIALIZE_TEMPLATE_STUFF(Mesh, meshes)
@@ -65,7 +65,7 @@ SPECIALIZE_TEMPLATE_STUFF(DummyRsrc, dummies)
 // Texture Specializations                                                     =
 //==============================================================================
 
-template<>
+/*template<>
 ResourceManager::Types<Texture>::Container&
 	ResourceManager::choseContainer<Texture>()
 {
@@ -114,5 +114,5 @@ void ResourceManager::allocAndLoadRsrc(const char* filename, Texture*& ptr)
 	{
 		ptr = dummyTex.get();
 	}
-}
+}*/
 

src/rsrc/ResourceManager.h

@@ -119,7 +119,7 @@ class ResourceManager
 
 inline void ResourceManager::postProcessFinishedLoadingRequests(float maxTime)
 {
-	rsrcAsyncLoadingReqsHandler.postProcessFinishedRequests(maxTime);
+	//rsrcAsyncLoadingReqsHandler.postProcessFinishedRequests(maxTime);
 }
 
 

src/rsrc/RsrcAsyncLoadingReqsHandler.cpp

@@ -5,7 +5,7 @@
 #include "util/Assert.h"
 #include "core/Globals.h"
 
-
+/*
 //==============================================================================
 // sendNewLoadingRequest <Texture>                                             =
 //==============================================================================
@@ -71,3 +71,4 @@ void RsrcAsyncLoadingReqsHandler::postProcessFinishedRequests(float maxTime)
 	}
 }
 
+*/

src/rsrc/RsrcAsyncLoadingReqsHandler.h

@@ -43,7 +43,7 @@ class RsrcAsyncLoadingReqsHandler
 		size_t getRequestsNum() const {return requests.size();}
 	
 	private:
-		AsyncLoader al; ///< Asynchronous loader
+		//AsyncLoader al; ///< Asynchronous loader
 		boost::ptr_list<RsrcLoadingRequestBase> requests; ///< Loading requests
 		/// The number of served requests for this frame
 		uint frameServedRequestsNum;

src/scene/Camera.h

@@ -20,10 +20,11 @@ class PointLight;
 class Camera: public SceneNode, public VisibilityInfo
 {
 	public:
+		/// @note Don't EVER change the order
 		enum CameraType
 		{
-			CT_ORTHOGRAPHIC,
 			CT_PERSPECTIVE,
+			CT_ORTHOGRAPHIC,
 			CT_NUM
 		};
 

src/scene/SceneNode.cpp

@@ -19,7 +19,7 @@ SceneNode::SceneNode(SceneNodeType type_, Scene& scene_, ulong flags_,
 	SceneNode* parent_)
 :	type(type_),
  	flags(flags_),
- 	parent(parent_),
+ 	parent(NULL),
  	scene(scene_)
 {
 	++uid;
@@ -31,9 +31,9 @@ SceneNode::SceneNode(SceneNodeType type_, Scene& scene_, ulong flags_,
 
 	enableFlag(SNF_ACTIVE);
 
-	if(parent != NULL)
+	if(parent_ != NULL)
 	{
-		parent->addChild(*this);
+		parent_->addChild(*this);
 	}
 
 	// This goes last

src/script/ScriptManager.cpp

@@ -10,7 +10,7 @@ using namespace boost::python;
 
 
 /// Define the classes
-BOOST_PYTHON_MODULE(Anki)
+BOOST_PYTHON_MODULE(anki)
 {
 	CALL_WRAP(HighRezTimer);
 
@@ -55,7 +55,7 @@ void ScriptManager::init()
 {
 	INFO("Initializing scripting engine...");
 
-	PyImport_AppendInittab((char*)("anki"), &initAnki);
+	PyImport_AppendInittab((char*)("anki"), &initanki);
 	Py_Initialize();
 	mainModule = object(handle<>(borrowed(PyImport_AddModule("__main__"))));
 	mainNamespace = mainModule.attr("__dict__");