WIP

Signed-off-by: Dan Printzell <[email protected]>

Author: Vild

assets/maps/room1-enemy.png

@@ -1,5 +1,79 @@
 {
 	"name": "room1",
 	"map": "room1.png",
-	"entities": []
+	"entities": [
+		{
+			"template": "enemy_longRange",
+			"components": {
+				"TransformComponent": {
+					"position": [
+						4,
+						0.2,
+						8
+					]
+				}
+			}
+		},
+		{
+			"template": "enemy_longRange",
+			"components": {
+				"TransformComponent": {
+					"position": [
+						15,
+						0.2,
+						12
+					]
+				}
+			}
+		},
+		{
+			"template": "enemy_longRange",
+			"components": {
+				"TransformComponent": {
+					"position": [
+						27,
+						0.2,
+						6
+					]
+				}
+			}
+		},
+		{
+			"template": "enemy_longRange",
+			"components": {
+				"TransformComponent": {
+					"position": [
+						28,
+						0.2,
+						10
+					]
+				}
+			}
+		},
+
+		{
+			"template": "enemy_closeRange",
+			"components": {
+				"TransformComponent": {
+					"position": [
+						11,
+						0.2,
+						3
+					]
+				}
+			}
+		},
+		{
+			"template": "enemy_closeRange",
+			"components": {
+				"TransformComponent": {
+					"position": [
+						20,
+						0.2,
+						4
+					]
+				}
+			}
+		}
+	]
 }

assets/maps/room1.json

@@ -2,7 +2,7 @@
 	"name": "smileyface",
 	"map": "smileyface.png",
 	"entities": [
-		 {
+		{
 			"template": "enemy_closeRange",
 			"components": {
 				"TransformComponent": {

assets/maps/room2.-enemypng

@@ -1,10 +1,10 @@
 import reggae;
 // -Wsuggest-override -Wno-error=suggest-override
-enum CFLAGS = "-std=c++17 -O0 -D_DEBUG -ggdb -Wall -Werror -Wno-unused-value -Wno-maybe-uninitialized -Wno-unused-but-set-variable -Wno-unused-function -fdiagnostics-color=always -fopenmp -I/usr/include/bullet/";
+enum CFLAGS = "-std=c++17 -O3 -D_DEBUG -ggdb -Wall -Werror -Wno-unused-value -Wno-maybe-uninitialized -Wno-unused-but-set-variable -Wno-unused-function -fdiagnostics-color=always -fopenmp -I/usr/include/bullet/";
 
 enum CompileCommand {
 	Compile = "g++ -c " ~ CFLAGS ~ " $in -o $out",
-	Link = "g++ -std=c++17 -O0 -ggdb -Wall -Werror -pedantic -Wno-maybe-uninitialized -fdiagnostics-color=always -fopenmp -lm -ldl -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lGL -lassimp -lBullet3Common -lBullet3Dynamics -lBullet3Geometry -lBullet3OpenCL_clew -lBulletCollision -lBulletDynamics -lBulletInverseDynamics -lBulletSoftBody -lLinearMath $in -o $out"
+	Link = "g++ -std=c++17 -O3 -ggdb -Wall -Werror -pedantic -Wno-maybe-uninitialized -fdiagnostics-color=always -fopenmp -lm -ldl -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lGL -lassimp -lBullet3Common -lBullet3Dynamics -lBullet3Geometry -lBullet3OpenCL_clew -lBulletCollision -lBulletDynamics -lBulletInverseDynamics -lBulletSoftBody -lLinearMath $in -o $out"
 }
 
 Target[] MakeObjects(string src)() {

assets/maps/smileyface.json

@@ -328,7 +328,7 @@ void RoomLoadingSystem::newRoom(World* world, coord_t coord) {
 	static MapLoader* mapLoader = engine->getMapLoader().get();
 	static BulletPhysicsSystem* bulletphyiscs = engine->getSystem<BulletPhysicsSystem>();
 
-	auto mapInfo = _maps[rand() % 8];
+	auto mapInfo = _maps[rand() % _maps.size()];
 
 	MapData map = mapLoader->loadFromImage("assets/maps/" + mapInfo->map);
 	Entity * room = world->addEntity("Room");