Added fancy house (marble coloring).

Praccen · Sep 30, 2023 · 14ee040 · 14ee040
1 parent 5873265
commit 14ee040
Show file tree

Hide file tree

Showing 9 changed files with 328,518 additions and 5 deletions.
diff --git a/code/src/Game/States/Game.ts b/code/src/Game/States/Game.ts
@@ -144,13 +144,20 @@ export default class Game extends State {
 			nrOfFireParticles
 		);
 		for (let i = 0; i < nrOfFireParticles; i++) {
-			let dir = new Vec3([Math.random() * 2.0 - 1.0, 0.0, Math.random() * 2.0 - 1.0]);
+			let dir = new Vec3([
+				Math.random() * 2.0 - 1.0,
+				0.0,
+				Math.random() * 2.0 - 1.0,
+			]);
 			fireParticles.setParticleData(
 				i,
 				new Vec3(),
 				0.1,
 				dir,
-				new Vec3(dir).flip().multiply(0.5).add(new Vec3([0.0, 0.5, 0.0]))
+				new Vec3(dir)
+					.flip()
+					.multiply(0.5)
+					.add(new Vec3([0.0, 0.5, 0.0]))
 			);
 		}
 		fireParticles.sizeChangePerSecond = 0.2;

diff --git a/code/src/Game/States/LoadingScreen.ts b/code/src/Game/States/LoadingScreen.ts
@@ -103,6 +103,7 @@ export default class LoadingScreen extends State {
 		this.octreesToLoad = [
 			["Assets/heightmaps/heightmap.png", 0.01, 10],
 			["Assets/objs/house.obj", 0.1, 20],
+			["Assets/objs/fancy_house.obj", 0.1, 20],
 			["Assets/objs/mailbox.obj", 0.1, 20],
 			["Assets/objs/BigBuske.obj", 0.1, 20],
 			["Assets/objs/Solros.obj", 0.1, 20],