summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-10-05 07:00:49 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-10-05 07:00:49 +0200
commita24cc110acebb3fc1b40a38d08f737bf09b15e54 (patch)
tree7859d031542270700da3b59d7b9f6927ec8b8076 /engine
parent5572a8133963447bc60098d952cebfe3902dad27 (diff)
Moved from TextureSTBI to Texture.
Diffstat (limited to 'engine')
-rw-r--r--engine/enemy.cpp4
-rw-r--r--engine/engine.cpp4
-rw-r--r--engine/player.cpp3
-rw-r--r--engine/stage.cpp4
4 files changed, 4 insertions, 11 deletions
diff --git a/engine/enemy.cpp b/engine/enemy.cpp
index 6d1bdad..a7aba0f 100644
--- a/engine/enemy.cpp
+++ b/engine/enemy.cpp
@@ -1,13 +1,11 @@
#include "enemy.h"
-#include <wriggle/texturestbi.h>
-
#include <wriggle/gl.h>
Enemy::Enemy(const Vector2& initpos, std::vector<BulletPattern*>& stage_patterns) : patterns(stage_patterns) {
pos = initpos;
- texture = new TextureSTBI("textures/enemy.png");
+ texture = new Texture("textures/enemy.png");
}
void Enemy::update() {
diff --git a/engine/engine.cpp b/engine/engine.cpp
index 4290c82..4e4b7fd 100644
--- a/engine/engine.cpp
+++ b/engine/engine.cpp
@@ -2,8 +2,6 @@
#include "config.h"
-#include <wriggle/texturestbi.h>
-
#include <wriggle/gl.h>
#include <iostream>
@@ -46,7 +44,7 @@ Engine::Engine() {
font = new FTTextureFont("fonts/VeraMono.ttf");
font->FaceSize(20);
- background = new TextureSTBI("textures/background.png");
+ background = new Texture("textures/background.png");
paused = false;
}
diff --git a/engine/player.cpp b/engine/player.cpp
index 4b09890..94b5074 100644
--- a/engine/player.cpp
+++ b/engine/player.cpp
@@ -2,7 +2,6 @@
#include <cmath>
#include "player.h"
-#include <wriggle/texturestbi.h>
#include "config.h"
Player::Player() {
@@ -10,7 +9,7 @@ Player::Player() {
y = 0.1;
move_factor = 0.005;
focus_factor = 0.5;
- texture = new TextureSTBI("textures/player.png");
+ texture = new Texture("textures/player.png");
}
void Player::draw() {
diff --git a/engine/stage.cpp b/engine/stage.cpp
index 9a5bedd..0eb7cb9 100644
--- a/engine/stage.cpp
+++ b/engine/stage.cpp
@@ -2,8 +2,6 @@
#include "config.h"
-#include <wriggle/texturestbi.h>
-
#include <wriggle/gl.h>
#include <cmath>
@@ -12,7 +10,7 @@ Stage::Stage() {
player = new Player();
- texture = new TextureSTBI("textures/shot1.png");
+ texture = new Texture("textures/shot1.png");
shader = new GLShaderProgram();
enemy_list.push_back(new Enemy1(Vector2(0.25, 0.75), patterns));