Changeset 9847 in orxonox.OLD for branches/new_class_id/src/lib/graphics

Timestamp:

Sep 27, 2006, 11:25:43 PM (18 years ago)

Author:

bensch

Message:

renamed NewResource to Resource

Location:

branches/new_class_id/src/lib/graphics

Files:

• importer/md2/resource_md2.cc (modified) (2 diffs)
• importer/md2/resource_md2.h (modified) (1 diff)
• importer/resource_obj.cc (modified) (2 diffs)
• importer/resource_obj.h (modified) (1 diff)
• importer/resource_texture.cc (modified) (2 diffs)
• importer/resource_texture.h (modified) (1 diff)
• resource_shader.cc (modified) (2 diffs)
• resource_shader.h (modified) (1 diff)
• text_engine/resource_font.cc (modified) (2 diffs)
• text_engine/resource_font.h (modified) (1 diff)

branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.cc

@@ -7 +7 @@
 
 ResourceMD2::ResourceMD2(const std::string& modelName, const std::string& skinName, float scale)
-    : NewResource(&ResourceMD2::type)
+    : Resource(&ResourceMD2::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(loadString(modelName, skinName, scale));
@@ -19 +19 @@
   {
     PRINTF(0)("NOT FOUND MD2: %s\n", modelName.c_str());
-    std::string modelFileName = this->NewResource::locateFile(modelName);
-    //std::string skinFileName = this->NewResource::locateFile(skinName);
+    std::string modelFileName = this->Resource::locateFile(modelName);
+    //std::string skinFileName = this->Resource::locateFile(skinName);
     this->MD2Model::load(modelFileName, skinName, scale);
-    this->NewResource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), Resources::KeepLevel(0), this->MD2Model::dataPointer()));
+    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), Resources::KeepLevel(0), this->MD2Model::dataPointer()));
   }
 

branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.h

@@ -12 +12 @@
 
 
-class ResourceMD2 : public MD2Model, public Resources::NewResource
+class ResourceMD2 : public MD2Model, public Resources::Resource
 {
 public:

branches/new_class_id/src/lib/graphics/importer/resource_obj.cc

@@ -7 +7 @@
 
 ResourceOBJ::ResourceOBJ(const std::string& imageName, float scaling)
-    : NewResource(&ResourceOBJ::type)
+    : Resource(&ResourceOBJ::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + MultiType(scaling).getString());
@@ -19 +19 @@
   {
     PRINTF(5)("NOT FOUND OBJ: %s\n", imageName.c_str());
-    std::string fileName = this->NewResource::locateFile(imageName);
+    std::string fileName = this->Resource::locateFile(imageName);
     this->acquireData(OBJModel(fileName, scaling).dataPointer());
-    this->NewResource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), Resources::KeepLevel(0), this->StaticModel::dataPointer()));
+    this->Resource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), Resources::KeepLevel(0), this->StaticModel::dataPointer()));
   }
 }

branches/new_class_id/src/lib/graphics/importer/resource_obj.h

@@ -11 +11 @@
 #include "objModel.h"
 
-class ResourceOBJ : public StaticModel, public Resources::NewResource
+class ResourceOBJ : public StaticModel, public Resources::Resource
 {
 public:

branches/new_class_id/src/lib/graphics/importer/resource_texture.cc

@@ -7 +7 @@
 
 ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
-    : NewResource(&ResourceTexture::type)
+    : Resource(&ResourceTexture::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + MultiType((int)target).getString());
@@ -19 +19 @@
   {
     PRINTF(5)("NOT FOUND TEXTURE: %s\n", imageName.c_str());
-    std::string fileName = this->NewResource::locateFile(imageName);
+    std::string fileName = this->Resource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);
-    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + MultiType((int)target).getString(), Resources::KeepLevel(0), this->Texture::dataPointer()));
+    this->Resource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + MultiType((int)target).getString(), Resources::KeepLevel(0), this->Texture::dataPointer()));
   }
 }

branches/new_class_id/src/lib/graphics/importer/resource_texture.h

@@ -12 +12 @@
 
 
-class ResourceTexture : public Texture, public Resources::NewResource
+class ResourceTexture : public Texture, public Resources::Resource
 {
 public:

branches/new_class_id/src/lib/graphics/resource_shader.cc

@@ -5 +5 @@
 
 ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName)
-    : NewResource(&ResourceShader::type)
+    : Resource(&ResourceShader::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(vertexShaderName +','+fragmentShaderName);
@@ -17 +17 @@
   {
     PRINTF(5)("NOT FOUND SHADER: %s\n", vertexShaderName.c_str());
-    std::string vertexFileName = this->NewResource::locateFile(vertexShaderName);
+    std::string vertexFileName = this->Resource::locateFile(vertexShaderName);
     std::string fragmentFileName;
     if (!fragmentShaderName.empty())
-      fragmentFileName = this->NewResource::locateFile(fragmentShaderName);
+      fragmentFileName = this->Resource::locateFile(fragmentShaderName);
 
     this->Shader::load(vertexFileName, fragmentFileName);
-    this->NewResource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
+    this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
   }
 }

branches/new_class_id/src/lib/graphics/resource_shader.h

@@ -12 +12 @@
 
 
-class ResourceShader : public Shader, public Resources::NewResource
+class ResourceShader : public Shader, public Resources::Resource
 {
 public:

branches/new_class_id/src/lib/graphics/text_engine/resource_font.cc

@@ -7 +7 @@
 
 ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize)
-  : Font(), NewResource(&ResourceFont::type)
+  : Font(), Resource(&ResourceFont::type)
 {
   assert(!fontName.empty());
@@ -20 +20 @@
   {
     PRINTF(5)("NOT FOUND FONT: %s\n", fontName.c_str());
-    std::string fileName = this->NewResource::locateFile(fontName);
+    std::string fileName = this->Resource::locateFile(fontName);
 
     printf("FONTFILE %s TO %s\n", fontName.c_str(), fileName.c_str());
 
     this->Font::loadFontFromTTF(fileName, renderSize);
-    this->NewResource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), Resources::KeepLevel(0), this->Font::dataPointer()));
+    this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), Resources::KeepLevel(0), this->Font::dataPointer()));
   }
 }

branches/new_class_id/src/lib/graphics/text_engine/resource_font.h

@@ -12 +12 @@
 
 
-class ResourceFont : public Font, public Resources::NewResource
+class ResourceFont : public Font, public Resources::Resource
 {
 public: