From 78f20e04a18033ae55e41521d2f6c1add988071e Mon Sep 17 00:00:00 2001 From: Linda Andersson Date: Tue, 10 Dec 2013 11:27:20 +0100 Subject: [PATCH] GL - moved object files to Obj --- .../GameState/C_DynamicObj.cpp | 42 ----------------- .../GameClientState/GameState/C_DynamicObj.h | 21 --------- .../GameClientState/GameState/C_Player.cpp | 46 ------------------- .../GameClientState/GameState/C_Player.h | 23 ---------- .../GameClientState/GameState/C_StaticObj.cpp | 45 ------------------ .../GameClientState/GameState/C_StaticObj.h | 21 --------- .../GameClientState/GameState/C_UIobject.cpp | 43 ----------------- .../GameClientState/GameState/C_UIobject.h | 20 -------- 8 files changed, 261 deletions(-) delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.cpp delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.h delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_Player.cpp delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_Player.h delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.cpp delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.h delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.cpp delete mode 100644 Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.h diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.cpp b/Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.cpp deleted file mode 100644 index 686bbca9..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "C_DynamicObj.h" -#include "DllInterfaces/GFXAPI.h" -using namespace DanBias::Client; -struct C_DynamicObj::myData -{ - myData(){} - Oyster::Graphics::Model::Model *model; - // light - // sound - // effect -}privData; -C_DynamicObj::C_DynamicObj(void) -{ -} - - -C_DynamicObj::~C_DynamicObj(void) -{ - -} -void C_DynamicObj::Init(ModelInitData modelInit) -{ - // load models - privData = new myData(); - privData->model = Oyster::Graphics::API::CreateModel(modelInit.modelPath); - privData->model->WorldMatrix = modelInit.world; - privData->model->Visible = modelInit.visible; -} -void C_DynamicObj::setPos() -{ - -} - -void C_DynamicObj::Render() -{ - Oyster::Graphics::API::RenderModel(*(privData->model)); -} -void C_DynamicObj::Release() -{ - Oyster::Graphics::API::DeleteModel(privData->model); - delete privData; -} \ No newline at end of file diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.h b/Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.h deleted file mode 100644 index 35a6e401..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once -#include "../C_Object.h" -namespace DanBias -{ - namespace Client - { -class C_DynamicObj : private C_Object -{ -private: - struct myData; - myData* privData; -public: - C_DynamicObj(void); - virtual ~C_DynamicObj(void); - void Init(ModelInitData modelInit); - void setPos(); - - void Render(); - void Release(); -};};}; - diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_Player.cpp b/Code/Game/DanBiasGame/GameClientState/GameState/C_Player.cpp deleted file mode 100644 index e47d98ef..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_Player.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "C_Player.h" -#include "DllInterfaces/GFXAPI.h" -using namespace DanBias::Client; - -struct C_Player::myData -{ - myData(){} - Oyster::Math3D::Float4x4 view; - Oyster::Math3D::Float4x4 proj; - Oyster::Graphics::Model::Model *model; -}privData; - -C_Player::C_Player(void) -{ -} - - -C_Player::~C_Player(void) -{ - -} - -void C_Player::Init(ModelInitData modelInit) -{ - // load models - privData = new myData(); - privData->model = Oyster::Graphics::API::CreateModel(modelInit.modelPath); - privData->model->WorldMatrix = modelInit.world; - privData->model->Visible = modelInit.visible; - - -} -void C_Player::setPos() -{ - -} - -void C_Player::Render() -{ - Oyster::Graphics::API::RenderModel(*(privData->model)); -} -void C_Player::Release() -{ - Oyster::Graphics::API::DeleteModel(privData->model); - delete privData; -} diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_Player.h b/Code/Game/DanBiasGame/GameClientState/GameState/C_Player.h deleted file mode 100644 index e9bdfa89..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_Player.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#include "../C_Object.h" -namespace DanBias -{ - namespace Client - { -class C_Player : public C_Object -{ -private: - struct myData; - myData* privData; - //Oyster::Graphics:: LIght -public: - C_Player(void); - ~C_Player(void); - void Init(ModelInitData modelInit); - void setPos(); - - void Render(); - void Release(); - -};};}; - diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.cpp b/Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.cpp deleted file mode 100644 index 54c36c2a..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.cpp +++ /dev/null @@ -1,45 +0,0 @@ - -#include "C_StaticObj.h" -#include "DllInterfaces/GFXAPI.h" -using namespace DanBias::Client; - -struct C_StaticObj::myData -{ - myData(){} - Oyster::Graphics::Model::Model *model; - // light - // sound - // effect -}privData; -C_StaticObj::C_StaticObj(void) -{ -} - - -C_StaticObj::~C_StaticObj(void) -{ - -} -void C_StaticObj::Init(ModelInitData modelInit) -{ - // load models - privData = new myData(); - privData->model = Oyster::Graphics::API::CreateModel(modelInit.modelPath); - privData->model->WorldMatrix = modelInit.world; - privData->model->Visible = modelInit.visible; - -} -void C_StaticObj::setPos() -{ - -} - -void C_StaticObj::Render() -{ - Oyster::Graphics::API::RenderModel(*(privData->model)); -} -void C_StaticObj::Release() -{ - Oyster::Graphics::API::DeleteModel(privData->model); - delete privData; -} \ No newline at end of file diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.h b/Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.h deleted file mode 100644 index 9da24351..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once -#include "../C_Object.h" -namespace DanBias -{ - namespace Client - { -class C_StaticObj : public C_Object -{ -private: - struct myData; - myData* privData; -public: - C_StaticObj(void); - virtual ~C_StaticObj(void); - void Init(ModelInitData modelInit); - void setPos(); - - void Render(); - void Release(); -};};}; - diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.cpp b/Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.cpp deleted file mode 100644 index b07ec6fa..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "C_UIobject.h" -#include "DllInterfaces/GFXAPI.h" -using namespace DanBias::Client; - -struct C_UIobject::myData -{ - myData(){} - Oyster::Math3D::Float4x4 view; - Oyster::Math3D::Float4x4 proj; - Oyster::Graphics::Model::Model *model; -}privData; - -C_UIobject::C_UIobject(void) -{ -} - - -C_UIobject::~C_UIobject(void) -{ -} -void C_UIobject::Init(ModelInitData modelInit) -{ - // load models - privData = new myData(); - privData->model = Oyster::Graphics::API::CreateModel(modelInit.modelPath); - privData->model->WorldMatrix = modelInit.world; - privData->model->Visible = modelInit.visible; - -} -void C_UIobject::setPos() -{ - -} - -void C_UIobject::Render() -{ - Oyster::Graphics::API::RenderModel(*(privData->model)); -} -void C_UIobject::Release() -{ - Oyster::Graphics::API::DeleteModel(privData->model); - delete privData; -} \ No newline at end of file diff --git a/Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.h b/Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.h deleted file mode 100644 index 6052a414..00000000 --- a/Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once -#include "../C_Object.h" -namespace DanBias -{ - namespace Client - { - class C_UIobject : public C_Object - { - private: - struct myData; - myData* privData; - public: - C_UIobject(void); - virtual ~C_UIobject(void); - void Init(ModelInitData modelInit); - void setPos(); - - void Render(); - void Release(); - };};}; \ No newline at end of file