Rtch/LibD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Fixed Qt's project file.

Browse Source
This commit is contained in:
Rtch90 2012-04-12 02:29:57 +01:00
parent abd57fcf78
commit 84d3121bfb
2 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
LibDQt/LibDQt.pro
View File

@ -9,11 +9,19 @@ LIBS += -lGL \
-lz \ -lz \
-ltinyxml -ltinyxml
HEADERS += ../src/Actor/Player.h \ HEADERS += ../src/Actor/Player.h \
../src/Collision/AABB.h \
../src/Global/Constants.h \
../src/Global/Globals.h \ ../src/Global/Globals.h \
../src/IO/Input.h \ ../src/IO/Input.h \
../src/Main/Game.h \ ../src/Level/MapTile.h \
../src/Level/Level.h \
../src/Level/Layer.h \
../src/Level/Tileset.h \
../src/Main/LGLXWindow.h \ ../src/Main/LGLXWindow.h \
../src/Main/GLWindow.h \
../src/Main/Game.h \
../src/Math/Timer.h \ ../src/Math/Timer.h \
../src/Math/Rect.h \
../src/Math/MathBox.h \ ../src/Math/MathBox.h \
../src/Math/FPS.h \ ../src/Math/FPS.h \
../src/Math/Vec2.h \ ../src/Math/Vec2.h \
@ -21,59 +29,48 @@ HEADERS += ../src/Actor/Player.h \
../src/System/Debug.h \ ../src/System/Debug.h \
../src/System/ResourceManager.h \ ../src/System/ResourceManager.h \
../src/Texture/Texture.h \ ../src/Texture/Texture.h \
../src/Global/Constants.h \
../src/Collision/AABB.h \
../src/Level/Level.h \
../src/Level/MapTile.h \
../src/Level/Map.h \
../src/Level/Layer.h \
../src/Level/Tileset.h \
../src/TMXParser/base64.h \
../src/TMXParser/Tmx.h \
../src/TMXParser/TmxImage.h \
../src/TMXParser/TmxLayer.h \
../src/TMXParser/TmxMap.h \
../src/TMXParser/TmxMapTile.h \
../src/TMXParser/TmxObject.h \
../src/TMXParser/TmxObjectGroup.h \
../src/TMXParser/TmxPoint.h \
../src/TMXParser/TmxPolygon.h \
../src/TMXParser/TmxPolyline.h \
../src/TMXParser/TmxPropertySet.h \
../src/TMXParser/TmxTile.h \
../src/TMXParser/TmxTileset.h \
../src/TMXParser/TmxUtil.h \ ../src/TMXParser/TmxUtil.h \
../src/Level/Layer.h \ ../src/TMXParser/TmxTileset.h \
../src/TMXParser/TmxTile.h \
../src/TMXParser/TmxPropertySet.h \
../src/TMXParser/TmxPolyline.h \
../src/TMXParser/TmxPolygon.h \
../src/TMXParser/TmxObjectGroup.h \
../src/TMXParser/TmxObject.h \
../src/TMXParser/TmxMapTile.h \
../src/TMXParser/TmxImage.h \
../src/TMXParser/TmxPoint.h \
../src/TMXParser/TmxMap.h \
../src/TMXParser/TmxLayer.h \
../src/TMXParser/Tmx.h \
../src/TMXParser/base64.h
SOURCES += ../src/Actor/Player.cpp \ SOURCES += ../src/Actor/Player.cpp \
../src/Collision/AABB.cpp \
../src/Global/Globals.cpp \ ../src/Global/Globals.cpp \
../src/Global/Constants.cpp \ ../src/Global/Constants.cpp \
../src/IO/Input.cpp \ ../src/IO/Input.cpp \
../src/Main/main.cpp \ ../src/Level/Tileset.cpp \
../src/Level/Level.cpp \
../src/Level/Layer.cpp \
../src/Main/LGLXWindow.cpp \ ../src/Main/LGLXWindow.cpp \
../src/Main/GLWindow.cpp \
../src/Main/Game.cpp \ ../src/Main/Game.cpp \
../src/Main/main.cpp \
../src/Math/Vec2.cpp \ ../src/Math/Vec2.cpp \
../src/Math/Timer.cpp \ ../src/Math/Timer.cpp \
../src/Math/FPS.cpp \ ../src/Math/FPS.cpp \
../src/Sprite/Sprite.cpp \ ../src/Sprite/Sprite.cpp \
../src/System/Debug.cpp \ ../src/System/Debug.cpp \
../src/Texture/Texture.cpp \ ../src/Texture/Texture.cpp \
../src/Collision/AABB.cpp \
../src/Level/Level.h \
../src/Level/MapTile.h \
../src/Level/Map.h \
../src/Level/Layer.h \
../src/Level/Tileset.h \
../src/TMXParser/base64.cpp \
../src/TMXParser/TmxImage.cpp \
../src/TMXParser/TmxLayer.cpp \
../src/TMXParser/TmxMap.cpp \
../src/TMXParser/TmxObject.cpp \
../src/TMXParser/TmxObjectGroup.cpp \
../src/TMXParser/TmxPolygon.cpp \
../src/TMXParser/TmxPolyline.cpp \
../src/TMXParser/TmxPropertySet.cpp \
../src/TMXParser/TmxTile.cpp \
../src/TMXParser/TmxTileset.cpp \
../src/TMXParser/TmxUtil.cpp \ ../src/TMXParser/TmxUtil.cpp \
../src/Level/Layer.cpp ../src/TMXParser/TmxTileset.cpp \
OTHER_FILES += ../src/TMXParser/TmxTile.cpp \
../src/TMXParser/TmxPropertySet.cpp \
../src/TMXParser/TmxPolyline.cpp \
../src/TMXParser/TmxPolygon.cpp \
../src/TMXParser/TmxObjectGroup.cpp \
../src/TMXParser/TmxObject.cpp \
../src/TMXParser/TmxMap.cpp \
../src/TMXParser/TmxLayer.cpp \
../src/TMXParser/TmxImage.cpp \
../src/TMXParser/base64.cpp

12
src/Actor/Player.cpp
View File

@ -15,7 +15,7 @@ Player::Player(void) {
_environmentCollisionBound = new AABB(); _environmentCollisionBound = new AABB();
_environmentCollisionBound->SetMin(_collisionBound->GetMin().x, _collisionBound->GetMax().y - 50.0f); _environmentCollisionBound->SetMin(_collisionBound->GetMin().x, _collisionBound->GetMax().y - 50.0f);
_environmentCollisionBound->SetMax(_collisionBound->GetMax()); //_environmentCollisionBound->SetMax(_collisionBound->GetMax());
} }
Player::~Player(void) { Player::~Player(void) {
@ -26,7 +26,7 @@ Player::~Player(void) {
void Player::Update(void) { void Player::Update(void) {
// Position and collision bound with the player. // Position and collision bound with the player.
_collisionBound->SetPositionOffset(_player->GetX(), _player->GetY()); _collisionBound->SetPositionOffset(_player->GetX(), _player->GetY());
_environmentCollisionBound->SetPositionOffset(_player->GetX, _player->GetY()); //_environmentCollisionBound->SetPositionOffset(_player->GetX, _player->GetY());
// Time to process the collisions. // Time to process the collisions.
ProcessCollisions(); ProcessCollisions();
@ -61,6 +61,14 @@ void Player::ProcessCollisions(void) {
// I'll do this tomorrow now. // I'll do this tomorrow now.
} }
void Player::EntityCollisionTest(void) {
}
void Player::ActorCollisionTest(void) {
}
void Player::ProcessEvents(void) { void Player::ProcessEvents(void) {
x = _player->GetX(); x = _player->GetX();
y = _player->GetY(); y = _player->GetY();