From dc72cabe2b0653d9f7ee01883791029c070bb852 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Mon, 29 May 2023 13:33:56 -0700
Subject: [PATCH] Test more skybox model shenanigans.

---
 Faceball2030/assets/worldSkyBox.png | Bin 2237 -> 8170 bytes
 Faceball2030/main.cpp               |  53 +++++++++++++++++-----------
 Faceball2030/main.h                 |   3 +-
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/Faceball2030/assets/worldSkyBox.png b/Faceball2030/assets/worldSkyBox.png
index 195e6855bf897cd110dc5b89b279eb9394ef3a83..7b01807b50f6fc8baca34c514838330557a3eadd 100644
GIT binary patch
literal 8170
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
M99;0_%QwXS5A8B`CjbBd

literal 2237
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn1=v6E*A2N2Y7q;xPaaFlqu
zIEGZrd3#M!$jOn1^&s!jzw2deTA!|;k@qtsB<tCn&Fp%&?(VE*b~yX{`scYb|K7{p
zR-en>aC~o`JOhJ`KLdlq1O|o%1x5x2N1$y@EI=zbf#wP^FbJqHFerG8Di{ri(eyBy
pFGkCU(Q<OMIvA}M8CYr=B#hht{}=bQ1GYyPJYD@<);T3K0RTvj?cM+Y

diff --git a/Faceball2030/main.cpp b/Faceball2030/main.cpp
index bff63ed..6662466 100644
--- a/Faceball2030/main.cpp
+++ b/Faceball2030/main.cpp
@@ -67,7 +67,7 @@ bool Enemy::CanShoot() {
 
 void Enemy::ShootBullet(int myIndex) {
 	fireDelay = game->enemyData[GetID()].fireDelay;
-	game->bullets.push_back({ game->bullet, {pos.x,pos.y+0.15f,pos.z},rot,0.2f,1,{std::cosf(rot) * game->shotSpd,std::sinf(rot) * game->shotSpd }, YELLOW,false,GetID(),myIndex,blinking});
+	game->bullets.push_back({ game->bullet, {pos.x,pos.y+0.15f,pos.z},rot,0.2f,1,true,{std::cosf(rot) * game->shotSpd,std::sinf(rot) * game->shotSpd }, YELLOW,false,GetID(),myIndex,blinking});
 }
 
 void Enemy::ReloadBullet(float fElapsedTime) {
@@ -436,7 +436,7 @@ void FaceBall::LoadLevel(int level)
 	walls = { mapWalls };
 	MapWallsObjectIndex = objects.size()-1;
 	objects.push_back({ mapFloor,{0,0,0},0,0 });
-	objects.push_back({ worldSkyBox,{0,0,0},0,0 });
+	objects.push_back({ worldSkyBox,{MAP_SIZE.x/2.f,0,MAP_SIZE.y/2.f},0,0,std::max(float(MAP_SIZE.x),float(MAP_SIZE.y))*2,false });
 	//objects.push_back({ game->mapExit,{(float)exitCoords.x+0.5f,0,(float)exitCoords.y+0.5f},0,0.4f });
 	exit = { game->mapExit,{(float)exitCoords.x + 0.5f,0.02f,(float)exitCoords.y + 0.5f},0,0.4f };
 	RegenerateMinimap();
@@ -955,7 +955,7 @@ void FaceBall::RenderMesh(mat4x4&matView,std::vector<Triangle>&vecTrianglesToRas
 
 		vec3d vCameraRay = Vector_Sub(triTransformed.p[0], freeRoam ? freeRoamCamera : player.GetPos());
 
-		if (Vector_DotProduct(normal, vCameraRay) < 0) {
+		if (Vector_DotProduct(normal, vCameraRay) < 0||!o.affectedByLighting) {
 			vec3d light_dir = Vector_Mul(vLookDir, -1);
 			light_dir = Vector_Normalise(light_dir);
 
@@ -967,9 +967,11 @@ void FaceBall::RenderMesh(mat4x4&matView,std::vector<Triangle>&vecTrianglesToRas
 			triViewed.uv[0] = triTransformed.uv[0];
 			triViewed.uv[1] = triTransformed.uv[1];
 			triViewed.uv[2] = triTransformed.uv[2];
-			triViewed.col[0] = Pixel(triTransformed.col[0].r * dp * dp, triTransformed.col[0].g * dp * dp, triTransformed.col[0].b * dp * dp);
-			triViewed.col[1] = Pixel(triTransformed.col[1].r * dp * dp, triTransformed.col[1].g * dp * dp, triTransformed.col[1].b * dp * dp);
-			triViewed.col[2] = Pixel(triTransformed.col[2].r * dp * dp, triTransformed.col[2].g * dp * dp, triTransformed.col[2].b * dp * dp);
+			if (o.affectedByLighting) {
+				triViewed.col[0] = Pixel(triTransformed.col[0].r * dp * dp, triTransformed.col[0].g * dp * dp, triTransformed.col[0].b * dp * dp);
+				triViewed.col[1] = Pixel(triTransformed.col[1].r * dp * dp, triTransformed.col[1].g * dp * dp, triTransformed.col[1].b * dp * dp);
+				triViewed.col[2] = Pixel(triTransformed.col[2].r * dp * dp, triTransformed.col[2].g * dp * dp, triTransformed.col[2].b * dp * dp);
+			}
 			Pixel originalCol[3] = { triViewed.col[0],triViewed.col[1],triViewed.col[2] };
 			float dist = std::sqrtf(std::powf((freeRoam ? freeRoamCamera : player.GetPos()).x - triTransformed.p[0].x, 2) + std::powf((freeRoam ? freeRoamCamera : player.GetPos()).y - triTransformed.p[0].y, 2) + std::powf((freeRoam ? freeRoamCamera : player.GetPos()).z - triTransformed.p[0].z, 2));
 			float dist2 = std::sqrtf(std::powf((freeRoam ? freeRoamCamera : player.GetPos()).x - triTransformed.p[1].x, 2) + std::powf((freeRoam ? freeRoamCamera : player.GetPos()).y - triTransformed.p[1].y, 2) + std::powf((freeRoam ? freeRoamCamera : player.GetPos()).z - triTransformed.p[1].z, 2));
@@ -977,22 +979,31 @@ void FaceBall::RenderMesh(mat4x4&matView,std::vector<Triangle>&vecTrianglesToRas
 			float colorMult = dist > 5 * PI / 3 ? 0 : std::sinf(0.3 * dist + PI / 2);
 			float colorMult2 = dist2 > 5 * PI / 3 ? 0 : std::sinf(0.3 * dist2 + PI / 2);
 			float colorMult3 = dist3 > 5 * PI / 3 ? 0 : std::sinf(0.3 * dist3 + PI / 2);
-			triViewed.col[0] = Pixel(triViewed.col[0].r * colorMult, triViewed.col[0].g * colorMult, triViewed.col[0].b * colorMult);
-			triViewed.col[1] = Pixel(triViewed.col[1].r * colorMult2, triViewed.col[1].g * colorMult2, triViewed.col[1].b * colorMult2);
-			triViewed.col[2] = Pixel(triViewed.col[2].r * colorMult3, triViewed.col[2].g * colorMult3, triViewed.col[2].b * colorMult3);
+			if (o.affectedByLighting) {
+				triViewed.col[0] = Pixel(triViewed.col[0].r * colorMult, triViewed.col[0].g * colorMult, triViewed.col[0].b * colorMult);
+				triViewed.col[1] = Pixel(triViewed.col[1].r * colorMult2, triViewed.col[1].g * colorMult2, triViewed.col[1].b * colorMult2);
+				triViewed.col[2] = Pixel(triViewed.col[2].r * colorMult3, triViewed.col[2].g * colorMult3, triViewed.col[2].b * colorMult3);
+			}
+			if (!o.affectedByLighting) {
+				triViewed.col[0] = originalCol[0];
+				triViewed.col[1] = originalCol[1];
+				triViewed.col[2] = originalCol[2];
+			}
 			triViewed.tex = triTransformed.tex;
 
-			for (Bullet& b : bullets) {
-				float dist = std::sqrtf(std::powf(b.pos.x - triTransformed.p[0].x, 2) + std::powf(b.pos.y - triTransformed.p[0].y, 2) + std::powf(b.pos.z - triTransformed.p[0].z, 2));
-				float dist2 = std::sqrtf(std::powf(b.pos.x - triTransformed.p[1].x, 2) + std::powf(b.pos.y - triTransformed.p[1].y, 2) + std::powf(b.pos.z - triTransformed.p[1].z, 2));
-				float dist3 = std::sqrtf(std::powf(b.pos.x - triTransformed.p[2].x, 2) + std::powf(b.pos.y - triTransformed.p[2].y, 2) + std::powf(b.pos.z - triTransformed.p[2].z, 2));
-				float colorMult = (dist < 2 ? std::sinf(0.75 * dist + PI / 2) * 4 :1);
-				float colorMult2 = (dist2 < 2 ? std::sinf(0.75 * dist2 + PI / 2) * 4 : 1);
-				float colorMult3 = (dist3 < 2 ? std::sinf(0.75 * dist3 + PI / 2) * 4 : 1);
-				Pixel lightCol = b.col / 2 + Pixel{ 128, 128, 128 };
-				if (dist < 2) {triViewed.col[0] = Pixel(std::min(255, std::max((int)originalCol[0].r, (int)(originalCol[0].r * colorMult / float(255.f/lightCol.r)))), std::min(255, std::max((int)originalCol[0].g, (int)(originalCol[0].g * colorMult / float(255.f / lightCol.g)))), std::min(255, std::max((int)originalCol[0].b, (int)(originalCol[0].b * colorMult / float(255.f / lightCol.b)))));}
-				if (dist2 < 2) {triViewed.col[1] = Pixel(std::min(255, std::max((int)originalCol[1].r, (int)(originalCol[1].r * colorMult2 / float(255.f / lightCol.r)))), std::min(255, std::max((int)originalCol[1].g, (int)(originalCol[1].g * colorMult2 / float(255.f / lightCol.g)))), std::min(255, std::max((int)originalCol[1].b, (int)(originalCol[1].b * colorMult2 / float(255.f / lightCol.b)))));}
-				if (dist3 < 2) {triViewed.col[2] = Pixel(std::min(255, std::max((int)originalCol[2].r, (int)(originalCol[2].r * colorMult3 / float(255.f / lightCol.r)))), std::min(255, std::max((int)originalCol[2].g, (int)(originalCol[2].g * colorMult3 / float(255.f / lightCol.g)))), std::min(255, std::max((int)originalCol[2].b, (int)(originalCol[2].b * colorMult3 / float(255.f / lightCol.b)))));}
+			if (o.affectedByLighting) {
+				for (Bullet& b : bullets) {
+					float dist = std::sqrtf(std::powf(b.pos.x - triTransformed.p[0].x, 2) + std::powf(b.pos.y - triTransformed.p[0].y, 2) + std::powf(b.pos.z - triTransformed.p[0].z, 2));
+					float dist2 = std::sqrtf(std::powf(b.pos.x - triTransformed.p[1].x, 2) + std::powf(b.pos.y - triTransformed.p[1].y, 2) + std::powf(b.pos.z - triTransformed.p[1].z, 2));
+					float dist3 = std::sqrtf(std::powf(b.pos.x - triTransformed.p[2].x, 2) + std::powf(b.pos.y - triTransformed.p[2].y, 2) + std::powf(b.pos.z - triTransformed.p[2].z, 2));
+					float colorMult = (dist < 2 ? std::sinf(0.75 * dist + PI / 2) * 4 : 1);
+					float colorMult2 = (dist2 < 2 ? std::sinf(0.75 * dist2 + PI / 2) * 4 : 1);
+					float colorMult3 = (dist3 < 2 ? std::sinf(0.75 * dist3 + PI / 2) * 4 : 1);
+					Pixel lightCol = b.col / 2 + Pixel{ 128, 128, 128 };
+					if (dist < 2) { triViewed.col[0] = Pixel(std::min(255, std::max((int)originalCol[0].r, (int)(originalCol[0].r * colorMult / float(255.f / lightCol.r)))), std::min(255, std::max((int)originalCol[0].g, (int)(originalCol[0].g * colorMult / float(255.f / lightCol.g)))), std::min(255, std::max((int)originalCol[0].b, (int)(originalCol[0].b * colorMult / float(255.f / lightCol.b))))); }
+					if (dist2 < 2) { triViewed.col[1] = Pixel(std::min(255, std::max((int)originalCol[1].r, (int)(originalCol[1].r * colorMult2 / float(255.f / lightCol.r)))), std::min(255, std::max((int)originalCol[1].g, (int)(originalCol[1].g * colorMult2 / float(255.f / lightCol.g)))), std::min(255, std::max((int)originalCol[1].b, (int)(originalCol[1].b * colorMult2 / float(255.f / lightCol.b))))); }
+					if (dist3 < 2) { triViewed.col[2] = Pixel(std::min(255, std::max((int)originalCol[2].r, (int)(originalCol[2].r * colorMult3 / float(255.f / lightCol.r)))), std::min(255, std::max((int)originalCol[2].g, (int)(originalCol[2].g * colorMult3 / float(255.f / lightCol.g)))), std::min(255, std::max((int)originalCol[2].b, (int)(originalCol[2].b * colorMult3 / float(255.f / lightCol.b))))); }
+				}
 			}
 			//triViewed.col = triTransformed.col;
 
@@ -1546,7 +1557,7 @@ void FaceBall::HandleKeys(float fElapsedTime) {
 		pitch = 0;
 		if (GetMouse(0).bPressed) {
 			if (PlayerActiveShotCount(0) < shotLimit) {
-				Bullet newBullet={ bullet,{player.GetPos().x,player.GetPos().y - 0.15f, player.GetPos().z},fYaw,0.125f,1,{shotSpd * std::cosf(fYaw),shotSpd * std::sinf(fYaw)},GREEN,true };
+				Bullet newBullet={ bullet,{player.GetPos().x,player.GetPos().y - 0.15f, player.GetPos().z},fYaw,0.125f,1,true,{shotSpd * std::cosf(fYaw),shotSpd * std::sinf(fYaw)},GREEN,true };
 				newBullet.playerIndex=0;
 				bullets.push_back(newBullet);
 			}
diff --git a/Faceball2030/main.h b/Faceball2030/main.h
index 0524c6c..64fbf35 100644
--- a/Faceball2030/main.h
+++ b/Faceball2030/main.h
@@ -145,6 +145,7 @@ struct Object {
 	float rot = 0;
 	float radius = 0.2f;
 	float scale = 1.f;
+	bool affectedByLighting = true;
 };
 
 struct Bullet : Object{
@@ -283,7 +284,7 @@ class FaceBall : public PixelGameEngine
 	Editor editor;
 	int MapWallsObjectIndex = -1;
 	bool exitWallsCleared = false;
-	int level=3;
+	int level=1;
 	int tagsRemaining = 10;
 	int lives = 3;
 	double gameTimer = 0;