diff --git a/Controller.h b/Controller.h index 6d85ad8..29b693e 100644 --- a/Controller.h +++ b/Controller.h @@ -9,6 +9,7 @@ public: Vec3f ypr; Vec2f joystick; bool button, joystickButton, magnetSwitch; + bool lastButton, lastJoystickButton, lastMagetSwitch; int controllerId; void setConnected(bool connected); diff --git a/ControllerHandler.cpp b/ControllerHandler.cpp index 5e12a15..900585e 100644 --- a/ControllerHandler.cpp +++ b/ControllerHandler.cpp @@ -120,8 +120,13 @@ void ControllerHandler::commandControllerData(std::vector data) { c->joystick.x = std::stoi(data[2])/2000.0f; c->joystick.y = std::stoi(data[3])/2000.0f; - c->joystickButton = !(data[4] == "0"); + c->lastButton = c->button; + c->lastJoystickButton = c->joystickButton; + c->lastMagetSwitch = c->magnetSwitch; + + c->joystickButton = !(data[4] == "0"); + c->button = !(data[8] == "0"); c->magnetSwitch = !(data[9] == "0"); } } diff --git a/CrystalPoint.cpp b/CrystalPoint.cpp index 65583c0..17f2cf7 100644 --- a/CrystalPoint.cpp +++ b/CrystalPoint.cpp @@ -24,7 +24,7 @@ void CrystalPoint::init() cursor = Cursor::getInstance(); menu = new Menu(); - menuIsBuild = false; + buildMenu(); lastFrameTime = 0; state = true; @@ -64,8 +64,11 @@ void CrystalPoint::update() lastFrameTime = frameTime; if (keyboardState.keys[27] && !prevKeyboardState.keys[27]) - state = !state; - + state = !state; + + Controller *rightcontroller = controller.getRightController(); + Controller *leftcontroller = controller.getLeftController(); + if (state) { Player* player = Player::getInstance(); @@ -75,7 +78,7 @@ void CrystalPoint::update() if (keyboardState.special[GLUT_KEY_RIGHT] && !prevKeyboardState.special[GLUT_KEY_RIGHT]) worldhandler->NextWorld(); if (keyboardState.special[GLUT_KEY_UP] && !prevKeyboardState.special[GLUT_KEY_UP]) - player->NextLeftWeapon(); + player->NextRightWeapon(); if (keyboardState.special[GLUT_KEY_DOWN] && !prevKeyboardState.special[GLUT_KEY_DOWN]) player->PreviousLeftWeapon(); if (keyboardState.keys[27]) @@ -103,42 +106,53 @@ void CrystalPoint::update() if (keyboardState.keys['q']) player->setPosition(1, deltaTime*speed, true); if (keyboardState.keys['e']) player->setPosition(-1, deltaTime*speed, true); - Controller *leftcontroller = controller.getLeftController(); if (leftcontroller != nullptr) { Vec2f *leftControllerJoystick = &leftcontroller->joystick; - - if (leftcontroller->joystickButton) { - controller.rumble(leftcontroller->controllerId, 100, 100); + if (leftControllerJoystick->y > 0.3 || leftControllerJoystick->y < -0.3) { + player->rotation.x += leftControllerJoystick->y/4; } - - if (leftControllerJoystick->y > 0.3) { - player->setPosition(270, leftControllerJoystick->y * deltaTime * 2.0f, false); - } - else if (leftControllerJoystick->y < -0.3) { - player->setPosition(90, leftControllerJoystick->y * -1 * deltaTime * 2.0f, false); - } - if (leftControllerJoystick->x > 0.3) { - player->setPosition(180, leftControllerJoystick->x * deltaTime * 2.0f, false); - } - else if (leftControllerJoystick->x < -0.3) { - player->setPosition(0, leftControllerJoystick->x * -1 * deltaTime * 2.0f, false); + if (leftControllerJoystick->x > 0.3 || leftControllerJoystick->x < -0.3) { + player->rotation.y += leftControllerJoystick->x/4; } player->leftWeapon->rotateWeapon(Vec3f(leftcontroller->ypr.y + 140, 0, -leftcontroller->ypr.z)); + if(leftcontroller->button && leftcontroller->joystickButton){ + state = !state; + }else if(!leftcontroller->lastButton && leftcontroller->button){ + leftcontroller->lastButton = leftcontroller->button; + controller.rumble(leftcontroller->controllerId, 100, 200); + player->NextLeftWeapon(); + }else if(!leftcontroller->lastJoystickButton && leftcontroller->joystickButton){ + leftcontroller->lastJoystickButton = leftcontroller->joystickButton; + player->hit = true; + } + } - Controller *rightcontroller = controller.getRightController(); if(rightcontroller != nullptr){ Vec2f *rightControllerJoystick = &rightcontroller->joystick; - if (rightControllerJoystick->y > 0.3 || rightControllerJoystick->y < -0.3) { - player->rotation.x += rightcontroller->joystick.y/4; + + if (rightControllerJoystick->y > 0.3) { + player->setPosition(270, rightControllerJoystick->y * deltaTime * 2.0f, false); + } + else if (rightControllerJoystick->y < -0.3) { + player->setPosition(90, rightControllerJoystick->y * -1 * deltaTime * 2.0f, false); + } + if (rightControllerJoystick->x > 0.3) { + player->setPosition(180, rightControllerJoystick->x * deltaTime * 2.0f, false); + } + else if (rightControllerJoystick->x < -0.3) { + player->setPosition(0, rightControllerJoystick->x * -1 * deltaTime * 2.0f, false); } - if (rightControllerJoystick->x > 0.3 || rightControllerJoystick->x < -0.3) { - player->rotation.y += rightcontroller->joystick.x/4; - } + if(!rightcontroller->lastButton && rightcontroller->button){ + rightcontroller->lastButton = rightcontroller->button; + controller.rumble(rightcontroller->controllerId, 100, 200); + player->NextRightWeapon(); + } + player->rightWeapon->rotateWeapon(Vec3f(rightcontroller->ypr.y + 140, 0, -rightcontroller->ypr.z)); } @@ -151,19 +165,25 @@ void CrystalPoint::update() if (!worldhandler->isPlayerPositionValid()) player->position = oldPosition; - /*else if (player->position.y > oldPosition.y + 1.2) - player->position = oldPosition; - */ worldhandler->update(deltaTime); } else { - if (!menuIsBuild) - { - buildMenu(); - menuIsBuild = true; - } menu->update(); + if (leftcontroller != nullptr) { + Vec2f *leftControllerJoystick = &leftcontroller->joystick; + if (leftControllerJoystick->y > 0.3 || leftControllerJoystick->y < -0.3) { + cursor->update(Vec2f(cursor->mousePosition.x,cursor->mousePosition.y+leftControllerJoystick->y )); + } + if (leftControllerJoystick->x > 0.3 || leftControllerJoystick->x < -0.3) { + cursor->update(Vec2f(cursor->mousePosition.x+leftControllerJoystick->x ,cursor->mousePosition.y)); + } + if(leftcontroller->button){ + cursor->state = 137; + }else if(cursor->state == 137){ + cursor->state = GLUT_UP; + } + } cursor->update(cursor->mousePosition + mouseOffset); } @@ -177,7 +197,7 @@ void CrystalPoint::update() void CrystalPoint::buildMenu() { - Button* start = new Button("Resume", Vec2f(width / 2 - 50, height / 2 - 30), 100, 50); + Button* start = new Button("Resume", Vec2f(1920 / 2 - 50, 1080 / 2 - 30), 100, 50); auto toWorld = [](Button* b) { state = true; @@ -186,14 +206,13 @@ void CrystalPoint::buildMenu() menu->AddMenuElement(start); - Button* test = new Button("Exit", Vec2f(width / 2 - 50, height / 2 + 30), 100, 50); + Button* test = new Button("Exit", Vec2f(1920 / 2 - 50, 1080 / 2 + 30), 100, 50); test->addAction([](Button* b) { exit(0); }); menu->AddMenuElement(test); - - Text* t = new Text("Pause", Vec2f(width / 2 - Util::glutTextWidth("Pause") / 2, height / 2 - 75)); + Text* t = new Text("Pause", Vec2f(1920 / 2 - Util::glutTextWidth("Pause") / 2, 1080 / 2 - 75)); t->setColor(Vec3f(255, 255, 0)); menu->AddMenuElement(t); } diff --git a/CrystalPoint.h b/CrystalPoint.h index 2c739dc..3ab6e53 100644 --- a/CrystalPoint.h +++ b/CrystalPoint.h @@ -43,7 +43,6 @@ public: static SoundSystem& GetSoundSystem() { return sound_system; } - bool menuIsBuild; private: static SoundSystem sound_system; diff --git a/CrystalPoint.vcxproj b/CrystalPoint.vcxproj index db9c4b3..7868161 100644 --- a/CrystalPoint.vcxproj +++ b/CrystalPoint.vcxproj @@ -170,7 +170,6 @@ - @@ -204,7 +203,6 @@ - diff --git a/CrystalPoint.vcxproj.filters b/CrystalPoint.vcxproj.filters index 8775746..cc3baac 100644 --- a/CrystalPoint.vcxproj.filters +++ b/CrystalPoint.vcxproj.filters @@ -123,9 +123,6 @@ Source Files - - Source Files - @@ -224,9 +221,6 @@ Header Files - - Header Files - diff --git a/Enemy.cpp b/Enemy.cpp index 2a5bc04..7dc9ac6 100644 --- a/Enemy.cpp +++ b/Enemy.cpp @@ -2,6 +2,7 @@ #include #include "Enemy.h" #include "Model.h" +#include "Player.h" #include Enemy::Enemy(const std::string &fileName, @@ -28,7 +29,7 @@ Enemy::Enemy(const std::string &fileName, hasTarget = false; hit_sound_id = CrystalPoint::GetSoundSystem().LoadSound(fileMusic.c_str(), false); music = CrystalPoint::GetSoundSystem().GetSound(hit_sound_id); - attack = false; + attack = false; } @@ -66,6 +67,14 @@ void Enemy::collide(const Entity * entity) position.z = difference.z + entity->position.z; } +void Enemy::hit(int damage){ + health -= damage; +} + +bool Enemy::isDead(){ + return health < 0; +} + void Enemy::update(float delta) { music->SetPos(position, Vec3f()); @@ -102,4 +111,21 @@ void Enemy::update(float delta) } rotation.y = atan2f(dx, dz) * 180 / M_PI; } + Player *player = Player::getInstance(); + + if(inObject(player->position + player->leftWeapon->collisionPoint)){ + if(!isHit){ + isHit = true; + hit(player->leftWeapon->damage); + } + std::cout << "HIT1"; + }else if(inObject(player->rightWeapon->collisionPoint)){ + if(!isHit){ + isHit = true; + hit(player->rightWeapon->damage); + } + std::cout << "HIT2"; + }else{ + isHit = false; + } } \ No newline at end of file diff --git a/Enemy.h b/Enemy.h index eb503b4..0be19e1 100644 --- a/Enemy.h +++ b/Enemy.h @@ -21,11 +21,15 @@ public: int xp; bool attack; + bool isHit; + void update(float); void draw(); void inEyeSight(Vec3f &); void collide(const Entity *entity); + void hit(int damage); + bool isDead(void); private: int hit_sound_id; }; diff --git a/LoadingScreen.cpp b/LoadingScreen.cpp deleted file mode 100644 index 5a6521c..0000000 --- a/LoadingScreen.cpp +++ /dev/null @@ -1,71 +0,0 @@ - -#include "stb_image.h" -#include "LoadingScreen.h" - -#include "CrystalPoint.h" -#include "Util.h" -#include - -LoadingScreen::LoadingScreen() -{ - points = 0; -} - - -LoadingScreen::~LoadingScreen() -{ -} - -void LoadingScreen::draw() -{ - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, CrystalPoint::width, CrystalPoint::height, 0, -10, 10); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - glDisable(GL_LIGHTING); - glDisable(GL_DEPTH_TEST); - glDisable(GL_COLOR_MATERIAL); - glEnable(GL_TEXTURE_2D); - - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBindTexture(GL_TEXTURE_2D, textureId); - glBegin(GL_QUADS); - glTexCoord2f(0, 1); - glVertex2f(0, 0); - glTexCoord2f(0, 0); - glVertex2f(0, CrystalPoint::height); - glTexCoord2f(1, 0); - glVertex2f(CrystalPoint::width, CrystalPoint::height); - glTexCoord2f(1, 1); - glVertex2f(CrystalPoint::width, 0); - glEnd(); - - /*glColor4f(1.0f, 1.0f, 0.0f, 1.0f); - - std::ostringstream oss; - - oss << loading << points << std::endl; - - Util::glutBitmapString(oss.str(), - CrystalPoint::width / 2 - Util::glutTextWidth(oss.str()), - CrystalPoint::height / 2 - 7);*/ - - glDisable(GL_TEXTURE_2D); - glEnable(GL_LIGHTING); - glEnable(GL_DEPTH_TEST); - glutSwapBuffers(); -} - -void LoadingScreen::rise() -{ - points++; - draw(); -} - -void LoadingScreen::setTexture(const std::string filename) -{ - textureId = Util::loadTexture(filename); -} \ No newline at end of file diff --git a/LoadingScreen.h b/LoadingScreen.h deleted file mode 100644 index f24d8c8..0000000 --- a/LoadingScreen.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once -#include -#include - -class LoadingScreen -{ -public: - LoadingScreen(); - ~LoadingScreen(); - - void draw(); - void rise(); - int points; - - GLuint textureId; - void setTexture(const std::string fileName); - -private: - const std::string loading = "Loaded: "; - -}; - diff --git a/Main.cpp b/Main.cpp index 086dc14..e9abf25 100644 --- a/Main.cpp +++ b/Main.cpp @@ -61,6 +61,7 @@ int main(int argc, char* argv[]) if (button == GLUT_LEFT_BUTTON) Cursor::getInstance()->state = state; + //std::cout << "Left button is down" << std::endl; }; @@ -79,9 +80,8 @@ void configureOpenGL() { //Init window and glut display mode glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); - glutInitWindowSize(1440, 900); - //glutInitWindowPosition((glutGet(GLUT_SCREEN_WIDTH) / 2) - (glutGet(GLUT_WINDOW_WIDTH) / 2), (glutGet(GLUT_SCREEN_HEIGHT) / 2) - (glutGet(GLUT_WINDOW_HEIGHT) / 2)); - + glutInitWindowSize(1440, 900); + //glutInitWindowPosition(glutGet(GLUT_WINDOW_WIDTH) / 2 - 800/2, glutGet(GLUT_WINDOW_HEIGHT) / 2 - 600/2); glutCreateWindow("Crystal Point"); //glutFullScreen(); diff --git a/Player.cpp b/Player.cpp index 84fe8e4..2513c54 100644 --- a/Player.cpp +++ b/Player.cpp @@ -18,6 +18,7 @@ Player::Player() maxXp = 100; level = 1; crystals = 0; + hit = false; loadWeapons(); @@ -150,6 +151,7 @@ void Player::loadWeapons() std::string name = w["name"].asString(); std::string fileN = w["file"].asString(); float damage = w["damage"].asFloat(); + float scale = w["scale"].asFloat(); Weapon::Element e = Weapon::FIRE; @@ -174,8 +176,8 @@ void Player::loadWeapons() Vec2f maxRot = Vec2f(w["maxRotation"][0].asFloat(), w["maxRotation"][1].asFloat()); Vec2f minRot = Vec2f(w["minRotation"][0].asFloat(), w["minRotation"][1].asFloat()); - lweapon = new Weapon(name, damage, e, fileN, 1, position, rotation, leftoffset, anchor, maxRot, minRot, collision); - rweapon = new Weapon(name, damage, e, fileN, 1, position, rotation, rightoffset, anchor, maxRot, minRot, collision); + lweapon = new Weapon(name, damage, e, fileN, scale, position, rotation, leftoffset, anchor, maxRot, minRot, collision); + rweapon = new Weapon(name, damage, e, fileN, scale, position, rotation, rightoffset, anchor, maxRot, minRot, collision); leftweapons.push_back(lweapon); rightweapons.push_back(rweapon); @@ -191,6 +193,8 @@ void Player::PreviousRightWeapon() currentrightweapon = (rightweapons.size() > level ? level - 1 : rightweapons.size() - 1); rightWeapon = rightweapons[currentrightweapon]; + rightWeapon->move(position); + rightWeapon->rotate(rotation); } void Player::NextRightWeapon(void) { @@ -200,6 +204,8 @@ void Player::NextRightWeapon(void) currentrightweapon = 0; rightWeapon = rightweapons[currentrightweapon]; + rightWeapon->move(position); + rightWeapon->rotate(rotation); } void Player::PreviousLeftWeapon(void) { @@ -209,6 +215,8 @@ void Player::PreviousLeftWeapon(void) currentleftweapon = (leftweapons.size() > level ? level - 1 : leftweapons.size() - 1); leftWeapon = leftweapons[currentleftweapon]; + leftWeapon->move(position); + leftWeapon->rotate(rotation); } void Player::NextLeftWeapon(void) { @@ -218,4 +226,6 @@ void Player::NextLeftWeapon(void) currentleftweapon = 0; leftWeapon = leftweapons[currentleftweapon]; + leftWeapon->move(position); + leftWeapon->rotate(rotation); } \ No newline at end of file diff --git a/Player.h b/Player.h index b843153..17bbe49 100644 --- a/Player.h +++ b/Player.h @@ -40,6 +40,8 @@ public: int level; int crystals; + bool hit; + float speed; void HpUp(int); diff --git a/Vector.cpp b/Vector.cpp index 35a6d41..c7ea763 100644 --- a/Vector.cpp +++ b/Vector.cpp @@ -2,6 +2,7 @@ #include #include "Vector.h" + Vec3f::Vec3f(float x, float y, float z) { this->x = x; diff --git a/WAVE/ape.wav b/WAVE/ape.wav new file mode 100644 index 0000000..29aecf6 Binary files /dev/null and b/WAVE/ape.wav differ diff --git a/WAVE/hedge.wav b/WAVE/hedge.wav new file mode 100644 index 0000000..c92201d Binary files /dev/null and b/WAVE/hedge.wav differ diff --git a/WAVE/letsRock.wav b/WAVE/letsRock.wav new file mode 100644 index 0000000..976eb2e Binary files /dev/null and b/WAVE/letsRock.wav differ diff --git a/Weapon.cpp b/Weapon.cpp index 878433b..5c78e92 100644 --- a/Weapon.cpp +++ b/Weapon.cpp @@ -27,7 +27,8 @@ Weapon::Weapon(std::string name, int damage, Element e, std::string modelFilenam this->ankerPoint = ankerPoint; this->maxRotation = maxRotation; this->minRotation = minRotation; - this->collision = collision; + this->collisionPoint = collisionPoint; + }; Weapon::~Weapon(){ @@ -52,11 +53,28 @@ void Weapon::move(Vec3f location){ position = location; } +Vec3f multiply(float matrix[16], Vec3f vec) +{ + Vec3f result; + + for(int i = 0; i < 4; i++) + { + for(int p = 0; p < 4; p++) + { + result[i] += matrix[i * p] * vec[p]; + } + } + + return result; +} + + void Weapon::draw(){ if (weaponmodel != nullptr) { glPushMatrix(); + //Player position and rotation glTranslatef(position.x, position.y, position.z); glRotatef(rotation.x, 1, 0, 0); @@ -66,28 +84,44 @@ void Weapon::draw(){ //offset from player glTranslatef(offsetPlayer.x, offsetPlayer.y, offsetPlayer.z); + glScalef(scale, scale, scale); + //Rotate weapon itself, from specific anker point glTranslatef(ankerPoint.x, ankerPoint.y, ankerPoint.z); glRotatef(rotationWeapon.z, 0, 0, 1); glRotatef(rotationWeapon.y, 0, 1, 0); glRotatef(rotationWeapon.x, 1, 0, 0); - glTranslatef(-ankerPoint.x, -ankerPoint.y, -ankerPoint.z); - - glScalef(scale, scale, scale); - - weaponmodel->draw(); - - //Test code for finding anker point +/* glColor3ub(255, 255, 0); - glTranslatef(ankerPoint.x, ankerPoint.y, ankerPoint.z); glBegin(GL_LINES); glVertex2f(0, 4); glVertex2f(0, -4); glVertex2f(4, 0); glVertex2f(-4, 0); - glEnd(); + glEnd();*/ + + glTranslatef(-ankerPoint.x, -ankerPoint.y, -ankerPoint.z); + + weaponmodel->draw(); + + //Test code for finding anchor point + glTranslatef(collisionPoint.x, collisionPoint.y, collisionPoint.z); + + float matrix[16]; + glGetFloatv(GL_MODELVIEW_MATRIX, matrix); + + Vec3f point = multiply(matrix, Vec3f(1,1,1)); + glPopMatrix(); + glPushMatrix(); + + + + glPopMatrix(); } } + + + diff --git a/Weapon.h b/Weapon.h index 187b5b0..059aefd 100644 --- a/Weapon.h +++ b/Weapon.h @@ -16,7 +16,7 @@ public: Weapon(std::string name, int damage, Element element, std::string modelFilename, float scale, Vec3f location, Vec2f rotation, Vec3f offsetPlayer, Vec3f ankerPoint, Vec2f maxRotation, Vec2f minXRotation, - Vec3f collision); + Vec3f collisionPoint); ~Weapon(); void draw(); @@ -32,8 +32,9 @@ public: float scale; Vec3f position, rotation, rotationWeapon; - Vec3f offsetPlayer, ankerPoint, collision; + Vec3f offsetPlayer, ankerPoint, collisionPoint; Vec2f maxRotation, minRotation; + }; diff --git a/World.cpp b/World.cpp index 30c6825..c08cc8d 100644 --- a/World.cpp +++ b/World.cpp @@ -9,16 +9,14 @@ #include "WorldHandler.h" World::World(const std::string &fileName) -{ +{ nextworld = false; //Store player instance player = Player::getInstance(); - //Create the interface interface = new Interface(); - //Open world json file std::ifstream file(fileName); @@ -27,7 +25,6 @@ World::World(const std::string &fileName) json::Value v = json::readJson(file); file.close(); - //Check file if(v["world"].isNull() || v["world"]["heightmap"].isNull() || v["world"]["skybox"].isNull()) @@ -42,13 +39,6 @@ World::World(const std::string &fileName) std::cout << "Invalid world file: enemies - " << fileName << "\n"; if (v["crystal"].isNull()) std::cout << "Invalid world file: crystals - " << fileName << "\n"; - - - if (!v["world"]["loadingscreen"].isNull()) - { - ls.setTexture(v["world"]["loadingscreen"].asString()); - ls.draw(); - } //Load object templates for (auto objt : v["world"]["object-templates"]) @@ -59,28 +49,23 @@ World::World(const std::string &fileName) cancollide = objt["collision"].asBool(); objecttemplates.push_back(std::pair>(objt["color"], std::pair(objt["file"], cancollide))); - } //Generate heightmap for this world heightmap = new HeightMap(v["world"]["heightmap"].asString(), this); - //Load skybox skybox = new Skybox(15000.0f, v["world"]["skybox"].asString()); skybox->init(); - //Map different texture to heightmap if available if(!v["world"]["texture"].isNull()) heightmap->SetTexture(v["world"]["texture"].asString()); - //Set player starting position player->position.x = v["player"]["startposition"][0].asFloat(); player->position.z = v["player"]["startposition"][2].asFloat(); player->position.y = heightmap->GetHeight(player->position.x, player->position.z); - //Load and place objects into world for (auto object : v["objects"]) @@ -113,7 +98,6 @@ World::World(const std::string &fileName) position.y = getHeight(position.x, position.z); entities.push_back(new LevelObject(object["file"].asString(), position, rotation, scale, hasCollision)); - } maxEnemies = 0; @@ -156,7 +140,6 @@ World::World(const std::string &fileName) maxEnemies++; enemies.push_back(new Enemy(e["file"].asString(), e["music"].asString(), e["damage"].asFloat(), e["health"].asFloat(), position, rotation, scale)); - } maxCrystals = 0; if (!v["crystal"].isNull()) @@ -200,7 +183,6 @@ World::World(const std::string &fileName) Crystal *c = new Crystal(filled, empty, position, rotation, scale); entities.push_back(c); - } interface->maxCrystals = maxCrystals; } @@ -210,7 +192,6 @@ World::World(const std::string &fileName) { sound_id = CrystalPoint::GetSoundSystem().LoadSound(v["world"]["music"].asString().c_str(), true); music = CrystalPoint::GetSoundSystem().GetSound(sound_id); - } if (!v["portal"].isNull()) @@ -236,7 +217,6 @@ World::World(const std::string &fileName) portal = new Portal(v["portal"]["file"], pos, rot, scale); entities.push_back(portal); portal->maxCrystals = maxCrystals; - } } @@ -269,6 +249,7 @@ float World::getHeight(float x, float y) void World::draw() { + player->setCamera(); float lightPosition[4] = { 0, 2, 1, 0 }; glLightfv(GL_LIGHT0, GL_POSITION, lightPosition); @@ -323,11 +304,14 @@ void World::update(float elapsedTime) //Al deze code zou in enemy moeten staan enemy->inEyeSight(player->position); - + enemy->update(elapsedTime); if (enemy->hasTarget) { + if(player->hit) + enemy->hit(player->leftWeapon->damage); + for (auto e : entities) { if (e->canCollide && e->inObject(enemy->position)) @@ -336,10 +320,12 @@ void World::update(float elapsedTime) break; } } - } if (enemy->attack) { + player->HpDown(enemy->damage / 4); + } + } remove = true; continue; } @@ -351,9 +337,8 @@ void World::update(float elapsedTime) if (remove) { - player->XpUp(enemies[count]->xp); delete enemies[count]; - + player->XpUp(enemies[count]->xp*2); enemies.erase(enemies.begin() + count); player->HpUp(10); } @@ -365,6 +350,8 @@ void World::update(float elapsedTime) if (portal->enter(elapsedTime)) nextworld = true; } + + player->hit = false; } @@ -385,3 +372,4 @@ bool World::isPlayerPositionValid() } return true; } + diff --git a/World.h b/World.h index 9ec6893..9dbebcf 100644 --- a/World.h +++ b/World.h @@ -10,7 +10,6 @@ #include "Skybox.h" #include "CrystalPoint.h" #include "Portal.h" -#include "LoadingScreen.h" class Entity; @@ -33,8 +32,6 @@ private: std::vector entities; std::vector enemies; //std::vector crystals; - - LoadingScreen ls; public: World(const std::string &fileName); ~World(); diff --git a/weapons.json b/weapons.json index 77177a9..264dd33 100644 --- a/weapons.json +++ b/weapons.json @@ -10,12 +10,13 @@ "collision": [ 0, 0, 0 ], "maxRotation": [ 170, 70 ], "minRotation": [ 20, -80 ], + "scale": 0.3, "left": { - "offset": [ 4.5, -8, -1 ] + "offset": [ 1.5, -2.6, 0 ] }, "right": { - "offset": [ 0.5, -8, -1 ] + "offset": [ -0.1, -2.6, 0 ] } }, { @@ -28,12 +29,13 @@ "collision": [ 0, 0, 0 ], "maxRotation": [ 170, 70 ], "minRotation": [ 20, -80 ], + "scale": 0.3, "left": { - "offset": [ 4.5, -8, -1 ] + "offset": [ 1.5, -2.6, 0 ] }, "right": { - "offset": [ 0.5, -8, -1 ] + "offset": [ -0.1, -2.6, 0 ] } } ] diff --git a/worlds/loadingScreen_picture.png b/worlds/loadingScreen_picture.png deleted file mode 100644 index 1088762..0000000 Binary files a/worlds/loadingScreen_picture.png and /dev/null differ diff --git a/worlds/rock.json b/worlds/rock.json index 4a1e8f7..cf3f2e8 100644 --- a/worlds/rock.json +++ b/worlds/rock.json @@ -2,7 +2,6 @@ "world": { "heightmap": "worlds/rockHeightmap.png", "texture": "worlds/rockStone.png", - "loadingscreen": "worlds/loadingScreen_picture.png", "skybox": "skyboxes/water/", "music": "WAVE/world1.wav", "object-templates": [ diff --git a/worlds/small.json b/worlds/small.json index dfc8bbb..62d5ddf 100644 --- a/worlds/small.json +++ b/worlds/small.json @@ -1,7 +1,6 @@ { "world": { "heightmap": "worlds/small.png", - "loadingscreen": "worlds/loadingScreen_picture.png", "skybox": "skyboxes/water/", "object-templates": [ { @@ -13,7 +12,7 @@ "music": "WAVE/world1.wav" }, "player": { - "startposition": [ 20, 0, 20 ] + "startposition": [ -10, -10, -10 ] }, "objects": [ ], "portal": {