GL - added UI object

Code/Game/DanBiasGame/DanBiasGame.vcxproj

@@ -189,6 +189,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="GameClientState\GameState\C_UIobject.cpp" />
     <ClCompile Include="DanBiasGame_Impl.cpp" />
     <ClCompile Include="DLLMain.cpp" />
     <ClCompile Include="GameClientState\GameState\C_DynamicObj.cpp" />
@@ -200,6 +201,7 @@
     <ClCompile Include="GameClientState\C_Object.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="GameClientState\GameState\C_UIobject.h" />
     <ClInclude Include="GameClientState\GameState\C_DynamicObj.h" />
     <ClInclude Include="GameClientState\GameClientState.h" />
     <ClInclude Include="GameClientState\GameState.h" />

Code/Game/DanBiasGame/GameClientState/C_Object.h

@@ -1,15 +1,24 @@
 #pragma once
+#include "DllInterfaces/GFXAPI.h"
 namespace DanBias
 {
 	namespace Client
 	{
+
+		struct  ModelInitData
+		{
+			std::wstring modelPath;
+			Oyster::Math::Float4x4 world; 
+			bool visible; 
+		};
+
 class C_Object
 {
 private:
 	
 public:
 
-	virtual void Init() = 0;
+	virtual void Init(ModelInitData modelInit) = 0;
 	virtual void setPos() = 0;
 
 	virtual void Render() = 0;

Code/Game/DanBiasGame/GameClientState/GameState.cpp

@@ -22,10 +22,15 @@ GameState::~GameState(void)
 }
 bool GameState::Init()
 {
+	ModelInitData modelData;
+
+	modelData.world = Oyster::Math3D::Float4x4::identity;
+	modelData.visible = true;
+	modelData.modelPath = L"worldDummy";
 	// load models
 	privData = new myData();
 	privData->player = new C_Player;
-	privData->player->Init();
+	privData->player->Init(modelData);
 
 	privData->proj = Oyster::Math3D::ProjectionMatrix_Perspective(Oyster::Math::pi/2,1024.0f/768.0f,.1f,1000);
 	Oyster::Graphics::API::SetProjection(privData->proj);

Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.cpp

@@ -18,11 +18,13 @@ C_DynamicObj::~C_DynamicObj(void)
 {
 	 
 }
-void C_DynamicObj::Init()
+void C_DynamicObj::Init(ModelInitData modelInit)
 {
 	// load models
 	privData = new myData();
-	privData->model = Oyster::Graphics::API::CreateModel(L"crate");
+	privData->model = Oyster::Graphics::API::CreateModel(modelInit.modelPath);
+	privData->model->WorldMatrix = modelInit.world;
+	privData->model->Visible = modelInit.visible;
 }
 void C_DynamicObj::setPos()
 {

Code/Game/DanBiasGame/GameClientState/GameState/C_DynamicObj.h

@@ -1,9 +1,10 @@
 #pragma once
+#include "../C_Object.h"
 namespace DanBias
 {
 	namespace Client
 	{
-class C_DynamicObj
+class C_DynamicObj : private C_Object
 {
 private:
 	struct myData;
@@ -11,7 +12,7 @@ private:
 public:
 	C_DynamicObj(void);
 	virtual ~C_DynamicObj(void);
-	void Init();
+	void Init(ModelInitData modelInit);
 	void setPos();
 
 	void Render();

Code/Game/DanBiasGame/GameClientState/GameState/C_Player.cpp

@@ -20,11 +20,15 @@ C_Player::~C_Player(void)
 	 
 }
 
-void C_Player::Init()
+void C_Player::Init(ModelInitData modelInit)
 {
 	// load models
 	privData = new myData();
-	privData->model = Oyster::Graphics::API::CreateModel(L"crate");
+	privData->model = Oyster::Graphics::API::CreateModel(modelInit.modelPath);
+	privData->model->WorldMatrix = modelInit.world;
+	privData->model->Visible = modelInit.visible;
+
+
 }
 void C_Player::setPos()
 {

Code/Game/DanBiasGame/GameClientState/GameState/C_Player.h

@@ -13,7 +13,7 @@ private:
 public:
 	C_Player(void);
 	~C_Player(void);
-	void Init();
+	void Init(ModelInitData modelInit);
 	void setPos();
 
 	void Render();

Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.cpp

@@ -20,11 +20,14 @@ C_StaticObj::~C_StaticObj(void)
 {
 	
 }
-void C_StaticObj::Init()
+void C_StaticObj::Init(ModelInitData modelInit)
 {
 	// load models
 	privData = new myData();
-	privData->model = Oyster::Graphics::API::CreateModel(L"worldDummy");
+	privData->model = Oyster::Graphics::API::CreateModel(modelInit.modelPath);
+	privData->model->WorldMatrix = modelInit.world;
+	privData->model->Visible = modelInit.visible;
+
 }
 void C_StaticObj::setPos()
 {

Code/Game/DanBiasGame/GameClientState/GameState/C_StaticObj.h

@@ -12,7 +12,7 @@ private:
 public:
 	C_StaticObj(void);
 	virtual ~C_StaticObj(void);
-	void Init();
+	void Init(ModelInitData modelInit);
 	void setPos();
 
 	void Render();

Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.cpp

@@ -0,0 +1,43 @@
+#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; 
+}

Code/Game/DanBiasGame/GameClientState/GameState/C_UIobject.h

@@ -0,0 +1,20 @@
+#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();
+		};};};

Code/Game/DanBiasGame/GameClientState/LobbyState.cpp

@@ -26,10 +26,16 @@ LobbyState::~LobbyState(void)
 }
 bool LobbyState::Init()
 {
+	ModelInitData modelData;
+
+	modelData.world = Oyster::Math3D::Float4x4::identity;
+	modelData.visible = true;
+	modelData.modelPath = L"crate";
 	// load models
 	privData = new myData();
 	privData->object = new C_StaticObj();
-	privData->object->Init();
+
+	privData->object->Init(modelData);
 
 	privData->proj = Oyster::Math3D::ProjectionMatrix_Perspective(Oyster::Math::pi/2,1024.0f/768.0f,.1f,1000);
 	//privData->proj = Oyster::Math3D::ProjectionMatrix_Orthographic(1024, 768, 1, 1000);

Code/Game/DanBiasGame/GameClientState/LobbyState.h

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef DANBIAS_CLIENT_GAMECLIENTSTATE_H
+#define DANBIAS_CLIENT_GAMECLIENTSTATE_H
+
 #include "GameClientState.h"
 namespace DanBias
 {
@@ -18,3 +20,4 @@ public:
 	bool Render();
 	bool Release();
 };};};
+#endif // ! DANBIAS_CLIENT_GAMECLIENTSTATE_H