Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/developer' into feature/weaponCollision

Browse Source 
Added waeponswitch to backbutton of controller

# Conflicts:
#	Enemy.cpp
#	Player.cpp
#	Weapon.cpp
#	Weapon.h
This commit is contained in:
jancoow
2016-06-21 23:10:58 +02:00
parent e7163fc07c 3cf6bf5857
commit ba0482ee0a
26 changed files with 782 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Weapon.cpp
+9 -3
View File
@@ -9,14 +9,20 @@
#include <cmath>
Weapon::Weapon(std::string modelFilename, float scale, Vec3f location, Vec2f rotation,
Vec3f offsetPlayer, Vec3f ankerPoint, Vec3f collisionPoint,
Vec2f maxRotation, Vec2f minRotation){
Weapon::Weapon(std::string name, int damage, Element e, std::string modelFilename, float scale, Vec3f location, Vec2f rotation,
Vec3f offsetPlayer, Vec3f ankerPoint,
Vec2f maxRotation, Vec2f minRotation,
Vec3f collision){
weaponmodel = Model::load(modelFilename);
rotate(rotation);
move(location);
this->scale = scale;
this->name = name;
this->damage = damage;
this->element = e;
this->offsetPlayer = offsetPlayer;
this->ankerPoint = ankerPoint;
this->maxRotation = maxRotation;