Selaa lähdekoodia

It compiles!!!

Panagiotis Christopoulos Charitos 14 vuotta sitten
vanhempi
sitoutus
9a958fc31d

+ 2 - 10
src/Main.cpp

@@ -29,7 +29,6 @@
 #include "Scripting/ScriptingEngine.h"
 #include "Core/StdinListener.h"
 #include "Scene/ModelNode.h"
-#include "Scene/SkelAnimModelNodeCtrl.h"
 #include "Resources/Model.h"
 #include "Core/Logger.h"
 #include "Util/Util.h"
@@ -171,7 +170,7 @@ void init()
 	horse->setLocalTransform(Transform(Vec3(-2, 0, 0), Mat3::getIdentity(), 1.0));
 
 	// Pentagram
-	pentagram = new ModelNode(false, NULL);
+	/*pentagram = new ModelNode(false, NULL);
 	pentagram->init("models/pentagram/pentagram.mdl");
 	pentagram->setLocalTransform(Transform(Vec3(2, 0, 0), Mat3::getIdentity(), 1.0));
 
@@ -190,7 +189,7 @@ void init()
 	imp->skelAnimModelNodeCtrl->set(imp->getSkin().getSkelAnims()[0].get());
 	imp->skelAnimModelNodeCtrl->setStep(0.8);
 
-	imp->addChild(*cam);
+	imp->addChild(*cam);*/
 
 
 	// sarge
@@ -315,13 +314,6 @@ void mainLoopExtra()
 	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_I))
 		character->moveForward(0.1);
 
-	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_T))
-	{
-		//pentagram->getModelPatchNodees()[0]->setUserDefVar(PatchNode::MT_BOTH, "specularCol", Vec3(10.0, -1.6, 1.6));
-		pentagram->getModelPatchNodes()[0]->getCpMtlRun().getUserDefinedVarByName("shininess").get<float>() = 10.0;
-	}
-
-
 	/*if(InputSingleton::getInstance().getKey(SDL_SCANCODE_F) == 1)
 	{
 		Event::ManagerSingleton::getInstance().createEvent(Event::MainRendererPpsHdr(HighRezTimer::getCrntTime() + 5,

+ 0 - 4
src/Scene/Camera.h

@@ -10,7 +10,6 @@
 #include "VisibilityInfo.h"
 
 
-class RenderableNode;
 class SpotLight;
 class PointLight;
 
@@ -66,9 +65,6 @@ class Camera: public SceneNode, public VisibilityInfo
 		/// - Update frustum planes
 		void moveUpdate();
 
-		/// Do nothing
-		void frameUpdate(float /*prevUpdateTime*/, float /*crntTime*/) {}
-
 		/// Do nothing
 		void init(const char*) {}
 

+ 14 - 0
src/Scene/RenderableNode.cpp

@@ -0,0 +1,14 @@
+#include "RenderableNode.h"
+
+
+//==============================================================================
+// Constructor                                                                 =
+//==============================================================================
+RenderableNode::RenderableNode(bool inheritParentTrfFlag,
+	SceneNode* parent)
+:	SceneNode(SNT_RENDERABLE, inheritParentTrfFlag, parent)
+{}
+
+
+RenderableNode::~RenderableNode()
+{}

+ 2 - 7
src/Scene/RenderableNode.h

@@ -16,9 +16,10 @@ class RenderableNode: public SceneNode
 {
 	public:
 		RenderableNode(bool inheritParentTrfFlag, SceneNode* parent);
+		virtual ~RenderableNode();
 
 		/// Get VAO depending the rendering pass
-		virtual const Vao& getVao(PassType p) const;
+		virtual const Vao& getVao(PassType p) const = 0;
 
 		/// Get vert ids number for rendering
 		virtual uint getVertIdsNum() const = 0;
@@ -34,10 +35,4 @@ class RenderableNode: public SceneNode
 };
 
 
-inline RenderableNode::RenderableNode(bool inheritParentTrfFlag,
-	SceneNode* parent)
-:	SceneNode(SNT_RENDERABLE, inheritParentTrfFlag, parent)
-{}
-
-
 #endif

+ 1 - 0
src/Scripting/BoostPythonInterfaces.cpp

@@ -14,6 +14,7 @@ BOOST_PYTHON_MODULE(Anki)
 
 	CALL_WRAP(SceneNode);
 	CALL_WRAP(Camera);
+	CALL_WRAP(MaterialRuntimeVariable);
 	CALL_WRAP(MaterialRuntime);
 	CALL_WRAP(PatchNode);
 	CALL_WRAP(ModelPatchNode);

+ 3 - 13
src/Scripting/Scene/MaterialRuntime.bpi.cpp

@@ -5,21 +5,11 @@
 WRAP(MaterialRuntime)
 {
 	class_<MaterialRuntime, noncopyable>("MaterialRuntime", no_init)
-		.def("getUserDefinedVars",
-			(boost::ptr_vector<MaterialRuntimeUserDefinedVar>&
-			(MaterialRuntime::*)())(&MaterialRuntime::getUserDefinedVars),
+		.def("getVariables",
+			(MaterialRuntime::VariablesContainer&
+			(MaterialRuntime::*)())(&MaterialRuntime::getVariables),
 			return_value_policy<reference_existing_object>())
 
-		.def("setUserDefVar", (void (MaterialRuntime::*)(const char*,
-			const float&))(&MaterialRuntime::setUserDefVarValue))
-		.def("setUserDefVar", (void (MaterialRuntime::*)(const char*,
-			const Vec2&))(&MaterialRuntime::setUserDefVarValue))
-		.def("setUserDefVar", (void (MaterialRuntime::*)(const char*,
-			const Vec3&))(&MaterialRuntime::setUserDefVarValue))
-		.def("setUserDefVar", (void (MaterialRuntime::*)(const char*,
-			const MtlUserDefinedVar::Fai&))(
-			&MaterialRuntime::setUserDefVarValue))
-
 		.def("isWireframeEnabled", (bool (MaterialRuntime::*)() const)(
 			&MaterialRuntime::isWireframeEnabled))
 		.def("setWireframeEnabled", &MaterialRuntime::setWireframeEnabled)

+ 16 - 0
src/Scripting/Scene/MaterialRuntimeVariable.bpi.cpp

@@ -0,0 +1,16 @@
+#include "ScriptingCommon.h"
+#include "Scene/MaterialRuntimeVariable.h"
+
+
+WRAP(MaterialRuntimeVariable)
+{
+	class_<MaterialRuntimeVariable, noncopyable>("MaterialRuntimeVariable",
+		no_init)
+		.def("setValue", (void (MaterialRuntimeVariable::*)(const float&))
+			(&MaterialRuntimeVariable::setValue))
+		.def("setValue", (void (MaterialRuntimeVariable::*)(const Vec2&))
+			(&MaterialRuntimeVariable::setValue))
+		.def("setValue", (void (MaterialRuntimeVariable::*)(const Vec3&))
+			(&MaterialRuntimeVariable::setValue))
+	;
+}

+ 2 - 5
src/Scripting/Scene/PatchNode.bpi.cpp

@@ -5,11 +5,8 @@
 WRAP(PatchNode)
 {
 	class_<PatchNode, noncopyable>("PatchNode", no_init)
-		.def("getCpMtlRun", (MaterialRuntime& (PatchNode::*)())(
-			&PatchNode::getCpMtlRun),
-			return_value_policy<reference_existing_object>())
-		.def("getDpMtlRun", (MaterialRuntime& (PatchNode::*)())(
-			&PatchNode::getDpMtlRun),
+		.def("getMaterialRuntime", (MaterialRuntime& (PatchNode::*)())(
+			&PatchNode::getMaterialRuntime),
 			return_value_policy<reference_existing_object>())
 	;
 }