Fix BlockSys

Using UnionPointer Made ModelPointer union using referencing date
HongLabInc · Jan 15, 2025 · 0be6957 · 0be6957
1 parent 8f6bb9e
commit 0be6957
Show file tree

Hide file tree

Showing 10 changed files with 309 additions and 243 deletions.
diff --git a/Block.cpp b/Block.cpp
@@ -1,221 +1,28 @@
 #include "Block.h"
 #include <iostream>
 
-mat4x4 blockModel[28] =
-{
-	/* ㅁ
-	   ㅁㅁㅁ  */
-	{
-		{0,0,0,0},
-		{1,0,0,0},
-		{1,1,1,0},
-		{0,0,0,0}
-	},
-	{
-		{0,1,0,0},
-	{0,1,0,0},
-	{1,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,1,0},
-	{0,0,1,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,0,0},
-	{1,0,0,0},
-	{1,0,0,0}
-	},
-
-	/*     ㅁ
-		ㅁㅁㅁ  */
-	{
-		{0,0,0,0},
-	{0,0,1,0},
-	{1,1,1,0},
-	{0,0,0,0}
-	},
-	{
-		{1,1,0,0},
-	{0,1,0,0},
-	{0,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,1,0},
-	{1,0,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,0,0,0},
-	{1,0,0,0},
-	{1,1,0,0}
-	},
-
-	/*   ㅁ
-	   ㅁㅁㅁ */
-	{
-		{0,0,0,0},
-	{0,1,0,0},
-	{1,1,1,0},
-	{0,0,0,0}
-	},
-	{
-		{0,1,0,0},
-	{1,1,0,0},
-	{0,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,1,0},
-	{0,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,0,0,0},
-	{1,1,0,0},
-	{1,0,0,0}
-	},
-
-	/* ㅁ
-	   ㅁ
-	   ㅁ
-	   ㅁ */
-	{
-		{1,0,0,0},
-	{1,0,0,0},
-	{1,0,0,0},
-	{1,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,1,1},
-	{0,0,0,0},
-	{0,0,0,0}
-	},
-	{
-		{1,0,0,0},
-	{1,0,0,0},
-	{1,0,0,0},
-	{1,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,1,1},
-	{0,0,0,0},
-	{0,0,0,0}
-	},
-
-	/* ㅁㅁ
-	   ㅁㅁ */
-	{
-		{0,0,0,0},
-	{1,1,0,0},
-	{1,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,0,0},
-	{1,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,0,0},
-	{1,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,0,0},
-	{1,1,0,0},
-	{0,0,0,0}
-	},
-
-	/*   ㅁㅁ
-	   ㅁㅁ   */
-	{
-		{0,0,0,0},
-	{0,1,1,0},
-	{1,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{1,0,0,0},
-	{1,1,0,0},
-	{0,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{0,1,1,0},
-	{1,1,0,0},
-	{0,0,0,0}
-	},
-	{
-		{1,0,0,0},
-	{1,1,0,0},
-	{0,1,0,0},
-	{0,0,0,0}
-	},
-
-	/* ㅁㅁ
-		 ㅁㅁ */
-	{
-		{0,0,0,0},
-	{1,1,0,0},
-	{0,1,1,0},
-	{0,0,0,0}
-	},
-	{
-		{0,1,0,0},
-	{1,1,0,0},
-	{1,0,0,0},
-	{0,0,0,0}
-	},
-	{
-		{0,0,0,0},
-	{1,1,0,0},
-	{0,1,1,0},
-	{0,0,0,0}
-	},
-	{
-		{0,1,0,0},
-	{1,1,0,0},
-	{1,0,0,0},
-	{0,0,0,0}
-	}
-};
-
 Block::Block(int posX = 0, int posY = 0):
 	x(posX), y(posY){
-	memset(block,0,sizeof(block));
 }
 
-void Block::Initalize() {
+int SetRandNum(int size) {
 
 	std::random_device rd;
 	std::mt19937 gen(rd());
 
-	int totalShapes = sizeof(blockModel) / sizeof(mat4x4);
+	std::uniform_int_distribution<> distr(0, size - 1);
 
-	std::uniform_int_distribution<> distr(0,totalShapes - 1);
-
-	int randomNumber = distr(gen);
+	return distr(gen);
+}
 
-	memcpy(block,blockModel[randomNumber],sizeof(blockModel[randomNumber]));
-	memcpy(prevShape,blockModel[randomNumber],sizeof(blockModel[randomNumber]));
+void Block::Initalize() {
+	type = static_cast<ShapeType>(SetRandNum(SHAPE_COUNT));
+	rotation =  static_cast<RotationState>(SetRandNum(ROTATION_COUNT));
 
+	currentShape = &modelPointers[type][0];
 }
 
+
 void Block::Update()
 {
 	y++;
@@ -245,41 +52,50 @@ void Block::MoveDown()
 }
 
 
-
-
-
 void Block::Rotate() {
 
-	memcpy(prevShape,block,sizeof(prevShape));
-
-	mat4x4 temp = {0};  // 임시 배열 초기화
-
-	// 90도 시계 방향 회전 로직
-	for(int i = 0; i < 4; i++) {
-		for(int j = 0; j < 4; j++) {
-			temp[j][3 - i] = block[i][j];
-		}
-	}
-
-	// 회전 결과를 block에 복사
-	memcpy(block,temp,sizeof(temp));
+	rotation = static_cast<RotationState>((rotation + 1) % ROTATION_COUNT);
 }
 
 void Block::rollback()
 {
-	memcpy(block,prevShape,sizeof(prevShape));
+	rotation = prevRotate;
 	x = prevX;
 	y = prevY;
 }
 
 void Block::UpdatePos() {
+
+	prevRotate = rotation;
 	prevX = x;
 	prevY = y;
-	memcpy(prevShape,block,sizeof(prevShape));  // 현재 블록 상태 저장
 }
 
-const mat4x4& Block::GetShape() const
+const ModelPointer* Block::GetShapeMatrix() const {
+
+	return currentShape;
+}
+
+int Block::GetMatrixSize() const
 {
-	return block;
+	if(type == SHAPE_O)
+		return 2;
+	 else if(type == SHAPE_I) 
+		return 4;
+	return 3;
 }
 
+char Block::GetValue(int i,int j) 
+{
+	currentShape[rotation].mat2[i][j];
+	if(type == SHAPE_O) {
+		return (*currentShape[rotation].mat2)[i][j]; // mat2x2 접근
+	} else if(type == SHAPE_I) {
+		return (*currentShape[rotation].mat4)[i][j]; // mat4x4 접근
+	} else {
+		return (*currentShape[rotation].mat3)[i][j]; // mat3x3 접근
+	}
+}
+
+
+
diff --git a/Block.h b/Block.h
@@ -2,17 +2,19 @@
 
 #include <random>
 #include "InputManager.h"
-
-
-typedef char mat4x4[4][4];
+#include "ModelPointer.h"
 
 extern mat4x4 blockModel[28];
 
 
 class Block {
-	mat4x4 prevShape;
-	mat4x4 block;
-
+
+	ShapeType type;          
+	RotationState rotation; 
+	RotationState prevRotate;
+
+
+	const ModelPointer* currentShape;
 
 	int prevX,prevY;
 	int x,y;
@@ -33,11 +35,17 @@ class Block {
 	void MoveDown();
 
 
-
 	void Rotate();
 	void rollback();
 
 	void UpdatePos();
 
-	const mat4x4& GetShape() const;
-};
+
+	const ModelPointer* GetShapeMatrix() const;
+	int GetMatrixSize() const;
+	char GetValue(int i,int j);
+
+};
+
+int SetRandNum();
+
diff --git a/Engine.cpp b/Engine.cpp
@@ -28,6 +28,12 @@ void Engine::LoadGameMode(GameMode * newGameMode)
 	gameMode = newGameMode;
 }
 
+void Engine::Initailize()
+{
+	InitializeModelPointers();
+
+}
+
 void Engine::Run()
 {
 	// 고해상도 카운터

diff --git a/Engine.h b/Engine.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "InputManager.h"
 #include "ConsoleRenderer.h"
+#include "ModelPointer.h"
 
 class GameMode;
 class Engine
@@ -11,6 +12,7 @@ class Engine
 
 	void LoadGameMode(GameMode* newGameMode);
 
+	void Initailize();
 	void Run();
 
 private:

diff --git a/HongLabTetris.cpp b/HongLabTetris.cpp
@@ -9,6 +9,7 @@ int main()
 {
     ConsoleRenderer renderer(60, 40, 240.0f); // 가로, 세로, 주사율
     Engine engine(renderer);
+    engine.Initailize();
     engine.Run();
 
     return 0;