Rename RenderablePicoModel to StaticModel

Replace the excessively long and confusing name with a more logical one. The
RenderablePicoSurface class is also renamed to StaticModelSurface.

radiant/Makefile.am

@@ -152,8 +152,8 @@ darkradiant_SOURCES = main.cpp \
                       modelfile/PicoModelLoader.cpp \
                       modelfile/PicoModelModule.cpp \
                       modelfile/PicoModelNode.cpp \
-                      modelfile/RenderablePicoModel.cpp \
-                      modelfile/RenderablePicoSurface.cpp \
+                      modelfile/StaticModel.cpp \
+                      modelfile/StaticModelSurface.cpp \
                       modelfile/WavefrontExporter.cpp \
                       modelfile/picomodel/pm_md3.c \
                       modelfile/picomodel/pm_md2.c \

radiant/modelfile/PicoModelLoader.cpp

@@ -57,8 +57,8 @@ scene::INodePtr PicoModelLoader::loadModel(const std::string& modelName)
 	}
 
 	// The cached model should be an PicoModel, otherwise we're in the wrong movie
-	RenderablePicoModelPtr picoModel =
-		std::dynamic_pointer_cast<RenderablePicoModel>(model);
+	StaticModelPtr picoModel =
+		std::dynamic_pointer_cast<StaticModel>(model);
 
 	if (picoModel)
 	{
@@ -105,8 +105,8 @@ IModelPtr PicoModelLoader::loadModelFromPath(const std::string& name)
 		return IModelPtr();
 	}
 
-	RenderablePicoModelPtr modelObj(
-		new RenderablePicoModel(model, fExt)
+	StaticModelPtr modelObj(
+		new StaticModel(model, fExt)
 	);
 
 	// Set the filename

radiant/modelfile/PicoModelNode.cpp

@@ -1,6 +1,6 @@
 #include "PicoModelNode.h"
 
-#include "RenderablePicoSurface.h"
+#include "StaticModelSurface.h"
 #include "ivolumetest.h"
 #include "ishaders.h"
 #include "iscenegraph.h"
@@ -12,9 +12,9 @@
 
 namespace model {
 
-// greebo: Construct a new RenderablePicoModel instance, we re-use the surfaces only
-PicoModelNode::PicoModelNode(const RenderablePicoModelPtr& picoModel) :
-    _picoModel(new RenderablePicoModel(*picoModel)), 
+// greebo: Construct a new StaticModel instance, we re-use the surfaces only
+PicoModelNode::PicoModelNode(const StaticModelPtr& picoModel) :
+    _picoModel(new StaticModel(*picoModel)), 
     _name(picoModel->getFilename()),
     _lightList(GlobalRenderSystem().attachLitObject(*this))
 {
@@ -80,11 +80,11 @@ scene::INode::Type PicoModelNode::getNodeType() const
     return Type::Model;
 }
 
-const RenderablePicoModelPtr& PicoModelNode::getModel() const {
+const StaticModelPtr& PicoModelNode::getModel() const {
     return _picoModel;
 }
 
-void PicoModelNode::setModel(const RenderablePicoModelPtr& model) {
+void PicoModelNode::setModel(const StaticModelPtr& model) {
     _picoModel = model;
 }
 

radiant/modelfile/PicoModelNode.h

@@ -8,11 +8,15 @@
 #include "irenderable.h"
 #include "pivot.h"
 #include "render/VectorLightList.h"
-#include "RenderablePicoModel.h"
+#include "StaticModel.h"
 #include "scene/Node.h"
 
 namespace model {
 
+/**
+ * \brief
+ * Scenegraph node representing a static model
+ */
 class PicoModelNode :
 	public scene::Node,
 	public ModelNode,
@@ -24,7 +28,7 @@ class PicoModelNode :
 {
 private:
 	// The actual model
-	RenderablePicoModelPtr _picoModel;
+	StaticModelPtr _picoModel;
 
 	std::string _name;
 
@@ -41,7 +45,7 @@ class PicoModelNode :
 public:
 	/** Construct a PicoModelNode with a reference to the loaded picoModel.
 	 */
-	PicoModelNode(const RenderablePicoModelPtr& picoModel);
+	PicoModelNode(const StaticModelPtr& picoModel);
 
 	virtual ~PicoModelNode();
 
@@ -75,8 +79,8 @@ class PicoModelNode :
 	virtual std::string name() const override;
 	Type getNodeType() const override;
 
-	const RenderablePicoModelPtr& getModel() const;
-	void setModel(const RenderablePicoModelPtr& model);
+	const StaticModelPtr& getModel() const;
+	void setModel(const StaticModelPtr& model);
 
 	// LitObject test function
 	bool intersectsLight(const RendererLight& light) const override;