Fixed: Map

Archive-CAU · Dec 11, 2022 · 0b4c6ad · 0b4c6ad
1 parent bfd3f35
commit 0b4c6ad
Show file tree

Hide file tree

Showing 39 changed files with 379 additions and 295 deletions.
diff --git a/Debug/CBottomWall.obj b/Debug/CBottomWall.obj
diff --git a/Debug/CFloor.obj b/Debug/CFloor.obj
diff --git a/Debug/CHandSphere.obj b/Debug/CHandSphere.obj
diff --git a/Debug/CHole.obj b/Debug/CHole.obj
diff --git a/Debug/CLeftWall.obj b/Debug/CLeftWall.obj
diff --git a/Debug/CLight.obj b/Debug/CLight.obj
diff --git a/Debug/CRightWall.obj b/Debug/CRightWall.obj
diff --git a/Debug/CTopWall.obj b/Debug/CTopWall.obj
diff --git a/Debug/CWall.obj b/Debug/CWall.obj
diff --git a/Debug/Csphere.obj b/Debug/Csphere.obj
diff --git a/Debug/DisplayGameStatus.obj b/Debug/DisplayGameStatus.obj
diff --git a/Debug/Player.obj b/Debug/Player.obj
diff --git a/Debug/VirtualLego.bsc b/Debug/VirtualLego.bsc
diff --git a/Debug/VirtualLego.exe b/Debug/VirtualLego.exe
diff --git a/Debug/VirtualLego.exe.recipe b/Debug/VirtualLego.exe.recipe
@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\김도엽\source\repos\OOP-Proj4\Debug\VirtualLego.exe</FullPath>
+      <FullPath>C:\Users\jimin\Desktop\repos\hyun-hang\OOP-Proj4\Debug\VirtualLego.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

diff --git a/Debug/VirtualLego.ilk b/Debug/VirtualLego.ilk
diff --git a/Debug/VirtualLego.log b/Debug/VirtualLego.log
diff --git a/Debug/VirtualLego.pdb b/Debug/VirtualLego.pdb
diff --git a/Debug/VirtualLego.tlog/BscMake.command.1.tlog b/Debug/VirtualLego.tlog/BscMake.command.1.tlog
diff --git a/Debug/VirtualLego.tlog/CL.write.1.tlog b/Debug/VirtualLego.tlog/CL.write.1.tlog
diff --git a/Debug/VirtualLego.tlog/VirtualLego.lastbuildstate b/Debug/VirtualLego.tlog/VirtualLego.lastbuildstate
@@ -1,2 +1,2 @@
-PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.34.31933:TargetPlatformVersion=10.0.22000.0:VcpkgTriplet=x86-windows:
-Debug|Win32|C:\Users\김도엽\Source\Repos\OOP-Proj4\|
+PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.22000.0:
+Debug|Win32|C:\Users\jimin\Desktop\repos\hyun-hang\OOP-Proj4\|
diff --git a/Debug/VirtualLego.tlog/bscmake.read.1.tlog b/Debug/VirtualLego.tlog/bscmake.read.1.tlog
diff --git a/Debug/VirtualLego.tlog/bscmake.write.1.tlog b/Debug/VirtualLego.tlog/bscmake.write.1.tlog
diff --git a/Debug/VirtualLego.tlog/link.command.1.tlog b/Debug/VirtualLego.tlog/link.command.1.tlog
diff --git a/Debug/VirtualLego.tlog/link.read.1.tlog b/Debug/VirtualLego.tlog/link.read.1.tlog
diff --git a/Debug/VirtualLego.tlog/link.write.1.tlog b/Debug/VirtualLego.tlog/link.write.1.tlog
diff --git a/Debug/d3dUtility.obj b/Debug/d3dUtility.obj
diff --git a/Debug/d3dfont.obj b/Debug/d3dfont.obj
diff --git a/Debug/d3dutil.obj b/Debug/d3dutil.obj
diff --git a/Debug/dxutil.obj b/Debug/dxutil.obj
diff --git a/Debug/status.obj b/Debug/status.obj
diff --git a/Debug/vc143.idb b/Debug/vc143.idb
diff --git a/Debug/vc143.pdb b/Debug/vc143.pdb
diff --git a/Debug/virtualLego.obj b/Debug/virtualLego.obj
diff --git a/Map.cpp b/Map.cpp
@@ -4,46 +4,24 @@ using namespace std;
 
 
 Map::Map(int num_platform) {
-	this->num_platform = num_platform;
+    this->num_platform = num_platform;
+    this->g_platforms.resize(16);
 }
 
 Map::~Map(void) {
 
 }
 
 
-bool Map::drawMap1(IDirect3DDevice9* Device) {
-
-	vector<array<float, 3>> g_platform_cord(num_platform);
-	// create platform
-	this->g_platforms[0].setPosition(0, 0, 0);
-	this->g_platforms[1].setPosition(-0.5, 0, 0.3);
-	this->g_platforms[2].setPosition(+0.5, 0, 0.3);
-	this->g_platforms[3].setPosition(-1.0, 0, 0.6);
-	this->g_platforms[4].setPosition(+1.0, 0, 0.6);
-	this->g_platforms[5].setPosition(-1.5, 0, 0.9);
-	this->g_platforms[6].setPosition(+1.5, 0, 0.9);
-	this->g_platforms[7].setPosition(-2.0, 0, 1.2);
-	this->g_platforms[8].setPosition(+2.0, 0, 1.2);
-
-	this->g_platforms[9].setPosition(+1.5, 0, 1.5);
-	this->g_platforms[10].setPosition(-1.5, 0, 1.5);
-	this->g_platforms[11].setPosition(+1.0, 0, 1.8);
-	this->g_platforms[12].setPosition(-1.0, 0, 1.8);
-	this->g_platforms[13].setPosition(+0.5, 0, 2.1);
-	this->g_platforms[14].setPosition(-0.5, 0, 2.1);
-	this->g_platforms[15].setPosition(+0.0, 0, 2.4);
-
-	for (int i = 0; i < num_platform; i++) {
-		if (!g_platforms[i].create(Device, d3d::GREEN)) return false;
-		D3DXVECTOR3 m = g_platforms[i].getPosition();
-		g_platforms[i].setPosition(m.x, m.y, m.z);
-	}
+void Map::setPosition(int i, float x, float y, float z) {
+
+    // create platform
+    this->g_platforms[i].setPosition(x, y, z);
 }
 
 
 void  Map::destroy(void) {
-	for (int i = 0; i < num_platform; i++) {
-		g_platforms[i].destroy();
-	}
-}
+    for (int i = 0; i < num_platform; i++) {
+        g_platforms[i].destroy();
+    }
+}
diff --git a/Map.h b/Map.h
@@ -1,18 +1,18 @@
-#ifndef _MAP_
 #include "Platform.h"
 #include "vector"
 
+using namespace std;
+
 class Map {
-private :
+private:
 	int num_platform;
+
+public:
 	vector<Platform> g_platforms;
-
-public :
+
 	Map(int num_platform);
 	~Map(void);
-
-	bool drawMap1(IDirect3DDevice9* Device);
-	void destroy(void);
-};
 
-#endif
+	void setPosition(int i, float x, float y, float z);
+	void destroy(void);
+};
diff --git a/VirtualLego.vcxproj b/VirtualLego.vcxproj
@@ -150,6 +150,7 @@
     <ClCompile Include="DisplayGameStatus.cpp" />
     <ClCompile Include="dxutil.cpp" />
     <ClCompile Include="Jumper.cpp" />
+    <ClCompile Include="Map.cpp" />
     <ClCompile Include="Platform.cpp" />
     <ClCompile Include="Player.cpp" />
     <ClCompile Include="status.cpp" />
@@ -175,6 +176,7 @@
     <ClInclude Include="DisplayGameStatus.h" />
     <ClInclude Include="dxutil.h" />
     <ClInclude Include="Jumper.h" />
+    <ClInclude Include="Map.h" />
     <ClInclude Include="Platform.h" />
     <ClInclude Include="Player.h" />
     <ClInclude Include="status.h" />

diff --git a/VirtualLego.vcxproj.filters b/VirtualLego.vcxproj.filters
@@ -78,6 +78,9 @@
     <ClCompile Include="DisplayText.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Map.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="d3dUtility.h">
@@ -140,5 +143,8 @@
     <ClInclude Include="DisplayText.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>