-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/knela96/Project1
- Loading branch information
Showing
14 changed files
with
225 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| #include "Application.h" | ||
| #include "ModuleRender.h" | ||
| #include "ModuleTextures.h" | ||
| #include "ModuleTentacles.h" | ||
| #include "ModulePlayer.h" | ||
|
|
||
| ModuleTentacles::ModuleTentacles() | ||
| {} | ||
|
|
||
| ModuleTentacles::~ModuleTentacles() | ||
| {} | ||
|
|
||
| bool ModuleTentacles::Start() { | ||
|
|
||
| LOG("Loading tentacle textures"); | ||
|
|
||
| graphics = App->textures->Load("Assets/Player.png"); | ||
| tentacle.anim.PushBack({ 6, 19, 4, 11 }); | ||
| tentacle.anim.loop = false; | ||
| tentacle.anim.speed = 0.0f; | ||
| /* | ||
| tentacle.anim->PushBack({ 17,0,16,16 }); | ||
| tentacle.anim->PushBack({ 33,0,16,16 }); | ||
| tentacle.anim->PushBack({ 49,0,16,16 }); | ||
| tentacle.anim->PushBack({ 65,0,16,16 });*/ | ||
| return true; | ||
| } | ||
|
|
||
| bool ModuleTentacles::CleanUp() | ||
| { | ||
| LOG("Unloading particles"); | ||
| App->textures->Unload(graphics); | ||
|
|
||
| for (uint i = 0; i < MAX_TENTACLES; ++i) | ||
| { | ||
| if (tentacles[i] != nullptr) | ||
| { | ||
| delete tentacles[i]; | ||
| tentacles[i] = nullptr; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| update_status ModuleTentacles::Update() { | ||
| for (uint i = 0; i < MAX_TENTACLES; ++i) | ||
| { | ||
| Tentacle* p = tentacles[i]; | ||
|
|
||
| if (p == nullptr) | ||
| continue; | ||
|
|
||
| if (p->Update() == false) | ||
| { | ||
| delete p; | ||
| tentacles[i] = nullptr; | ||
| }else{ | ||
| setPosition(App->player->position.x, App->player->position.y); | ||
| if(!p->flip) | ||
| App->render->Blit(graphics, p->first_point.x, p->first_point.y, &p->anim.GetCurrentFrame(),1.0f, 0.0f); | ||
| else | ||
| App->render->Blit(graphics, p->first_point.x, p->first_point.y, &p->anim.GetCurrentFrame(), 1.0f, 180.0f); | ||
|
|
||
| } | ||
| } | ||
| return UPDATE_CONTINUE; | ||
| } | ||
|
|
||
| void ModuleTentacles::AddTentacle(const Tentacle& tentacle, int x, int y, bool flip) | ||
| { | ||
| for (uint i = 0; i < MAX_TENTACLES; ++i) | ||
| { | ||
| if (tentacles[i] == nullptr) | ||
| { | ||
| Tentacle* p = new Tentacle(tentacle); | ||
| p->flip = flip; | ||
| tentacles[i] = p; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void ModuleTentacles::setPosition(int x, int y) { | ||
| for (uint i = 0; i < MAX_TENTACLES; ++i) | ||
| { | ||
| if (tentacles[i] != nullptr) | ||
| { | ||
| int invert = 0; | ||
| Tentacle* p = tentacles[i]; | ||
| if (tentacles[i]->flip) | ||
| invert = -1; | ||
| else | ||
| invert = 1; | ||
|
|
||
| if (i != 0 && i != MAX_TENTACLES/2) { | ||
| p->first_point.x = tentacles[i - 1]->second_point.x; | ||
| p->first_point.y = tentacles[i - 1]->second_point.y; | ||
| p->second_point.x = p->first_point.x; | ||
| p->second_point.y = p->first_point.y - p->anim.GetCurrentFrame().h * invert; | ||
| } | ||
| else { | ||
| if (tentacles[i]->flip) { | ||
| p->first_point.y = y + 9; | ||
| } | ||
| else { | ||
| p->first_point.y = y - 4; | ||
| } | ||
| p->first_point.x = x + 20; | ||
|
|
||
| p->second_point.x = p->first_point.x; | ||
| p->second_point.y = p->first_point.y - p->anim.GetCurrentFrame().h * invert; | ||
| } | ||
| tentacles[i] = p; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| //-------------------------------------------- | ||
| //-------------------------------------------- | ||
|
|
||
| Tentacle::Tentacle() | ||
| { | ||
| first_point.SetToZero(); | ||
| } | ||
|
|
||
| Tentacle::Tentacle(const Tentacle& p) : | ||
| first_point(p.first_point), second_point(p.second_point), | ||
| anchor(p.anchor), anim(p.anim) | ||
| {} | ||
|
|
||
| bool Tentacle::Update() | ||
| { | ||
| bool ret = true; | ||
|
|
||
|
|
||
| return ret; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #ifndef __MODULETENTACLES_H__ | ||
| #define __MODULETENTACLES_H__ | ||
|
|
||
| #include "p2Point.h" | ||
| #include "Animation.h" | ||
| #include "ModuleCollision.h" | ||
|
|
||
| #define MAX_TENTACLES 12 | ||
|
|
||
| struct SDL_Texture; | ||
| struct SDL_Rect; | ||
| struct Collider; | ||
|
|
||
| struct Tentacle { | ||
| Collider* collider = nullptr; | ||
| iPoint first_point; | ||
| iPoint second_point; | ||
| bool anchor = false; | ||
| Animation anim; | ||
| bool flip = false; | ||
|
|
||
| Tentacle(); | ||
| Tentacle(const Tentacle& p); | ||
| bool Update(); | ||
| }; | ||
|
|
||
|
|
||
| class ModuleTentacles : public Module | ||
| { | ||
| public: | ||
| Tentacle tentacle; | ||
| Tentacle* tentacles[MAX_TENTACLES]; | ||
| private: | ||
| SDL_Texture * graphics = nullptr; | ||
| public: | ||
| ModuleTentacles(); | ||
| ~ModuleTentacles(); | ||
| bool Start(); | ||
| update_status Update(); | ||
| bool CleanUp(); | ||
| void AddTentacle(const Tentacle& tentacle, int x, int y,bool flip); | ||
| void setPosition(int x, int y); | ||
| }; | ||
|
|
||
| #endif // __ENEMY_H__ |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.