sigonasr2/Faceball2030
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented Sonar model.

Browse Source
This commit is contained in:
sigonasr2 2023-04-12 22:50:54 -05:00
parent 65c5a742ac
commit 7ab07a3482
8 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Faceball2030/Editor.h
View File

@ -11,6 +11,7 @@ enum EnemyID {
EXIT, EXIT,
START, START,
SHOOTME, SHOOTME,
SONAR,
COIN = 56, COIN = 56,
POWERUP_ARMOR = 57, POWERUP_ARMOR = 57,
POWERUP_SPEED = 58, POWERUP_SPEED = 58,

BIN
Faceball2030/assets/enemies/Cylinder1_auv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

11
Faceball2030/assets/enemies/Sonar.mtl Normal file
View File

@ -0,0 +1,11 @@
# Exported from Wings 3D 2.2.9
newmtl Cylinder1_auv
Ns 19.999999999999996
d 1.0
illum 2
Kd 1.0 1.0 1.0
Ka 0.0 0.0 0.0
Ks 0.19 0.19 0.19
Ke 0.0 0.0 0.0
map_Kd Cylinder1_auv.png

BIN
Faceball2030/assets/enemies/Sonar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
Faceball2030/assets/enemies/Sonar.wings Normal file
View File

Binary file not shown.

4
Faceball2030/assets/map/map1.map
View File

@ -30,5 +30,5 @@
8195 8195
8194 8194
8202 8202
8202 25114
8206 24590

3
Faceball2030/main.cpp
View File

@ -36,6 +36,7 @@ void FaceBall::InitializeEnemyData() {
enemyData[EXIT] = { "EXIT",undefined,GREEN }; enemyData[EXIT] = { "EXIT",undefined,GREEN };
enemyData[START] = { "SPAWN POSITION",undefined,{128,64,0} }; enemyData[START] = { "SPAWN POSITION",undefined,{128,64,0} };
enemyData[SHOOTME] = { "SHOOTME",enemy_ShootMe,YELLOW,1,1,PI / 8,2,1,3 }; enemyData[SHOOTME] = { "SHOOTME",enemy_ShootMe,YELLOW,1,1,PI / 8,2,1,3 };
enemyData[SONAR] = { "Sonar",enemy_Sonar,RED,5,1,PI / 8,2,1,3 };
enemyData[COIN] = { "Coin",undefined,BLUE }; enemyData[COIN] = { "Coin",undefined,BLUE };
enemyData[POWERUP_ARMOR] = { "Armor",undefined,{96,0,96} }; enemyData[POWERUP_ARMOR] = { "Armor",undefined,{96,0,96} };
enemyData[POWERUP_SPEED] = { "Speed",undefined,{96,0,96} }; enemyData[POWERUP_SPEED] = { "Speed",undefined,{96,0,96} };
@ -844,8 +845,10 @@ bool FaceBall::OnUserCreate()
wall_tex = new Decal(new Sprite("assets/wall.png")); wall_tex = new Decal(new Sprite("assets/wall.png"));
bullet_tex = new Decal(new Sprite("assets/enemies/bullet.png")); bullet_tex = new Decal(new Sprite("assets/enemies/bullet.png"));
floor_tex = new Decal(new Sprite("assets/floor.png")); floor_tex = new Decal(new Sprite("assets/floor.png"));
enemy_Sonar_tex = new Decal(new Sprite("assets/enemies/Sonar.png"));
enemy_ShootMe = { "assets/enemies/ShootMe.obj", enemy_ShootMe_tex }; enemy_ShootMe = { "assets/enemies/ShootMe.obj", enemy_ShootMe_tex };
enemy_Sonar = { "assets/enemies/Sonar.obj", enemy_Sonar_tex };
bullet = { "assets/enemies/bullet.obj",bullet_tex }; bullet = { "assets/enemies/bullet.obj",bullet_tex };
mapWalls.texture = wall_tex; mapWalls.texture = wall_tex;
mapFloor.texture = floor_tex; mapFloor.texture = floor_tex;

6
Faceball2030/main.h
View File

@ -196,9 +196,11 @@ class FaceBall : public PixelGameEngine
std::map<EnemyID, EnemyData>enemyData; std::map<EnemyID, EnemyData>enemyData;
std::vector<Enemy>enemies; std::vector<Enemy>enemies;
private: private:
Mesh mapWalls,mapFloor,enemy_ShootMe,bullet,green_bullet,undefined; Mesh mapWalls,mapFloor,enemy_ShootMe,bullet,green_bullet,undefined,
enemy_Sonar;
Decal* dot, * enemy_ShootMe_tex,*bullet_tex,*wall_tex,*floor_tex; Decal* dot, * enemy_ShootMe_tex,*bullet_tex,*wall_tex,*floor_tex,
*enemy_Sonar_tex;
vi2d MAP_SIZE; vi2d MAP_SIZE;
std::vector<std::vector<MapSquare>>map; std::vector<std::vector<MapSquare>>map;
std::vector<Object>objects; std::vector<Object>objects;