Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. b4ac19d68082ac7f78101145c15ba1fa64ad6023
|
From: Lawrence S. <ljs...@us...> - 2015-05-09 16:34:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, master has been updated
via b4ac19d68082ac7f78101145c15ba1fa64ad6023 (commit)
from 7ed60d1e2232e7b4668860215c21ac8857cbf0d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b4ac19d68082ac7f78101145c15ba1fa64ad6023
Author: Lawrence Sebald <ljs...@us...>
Date: Sat May 9 12:33:46 2015 -0400
Fix compilation in new kos-ports.
-----------------------------------------------------------------------
Summary of changes:
src/animation.cpp | 10 +++++-----
src/anims/alphafader.cpp | 4 ++--
src/anims/expxymover.cpp | 6 +++---
src/anims/logxymover.cpp | 2 +-
src/anims/tintfader.cpp | 6 +++---
src/drawable.cpp | 11 +++++------
src/drawables/banner.cpp | 7 +++----
src/drawables/label.cpp | 7 +++----
src/font.cpp | 8 ++++----
src/genmenu.cpp | 9 ++++-----
src/matrix.cpp | 8 ++++----
src/matrixdouble.cpp | 10 +++++-----
src/sound.cpp | 7 +++----
src/texture.cpp | 7 +++----
src/trigger.cpp | 11 +++++------
src/triggers/birth.cpp | 11 +++++------
src/triggers/death.cpp | 11 +++++------
src/vector.cpp | 11 +++++------
src/vector3.cpp | 9 ++++-----
src/vectordouble.cpp | 8 ++++----
20 files changed, 76 insertions(+), 87 deletions(-)
diff --git a/src/animation.cpp b/src/animation.cpp
index 8820994..f96a723 100644
--- a/src/animation.cpp
+++ b/src/animation.cpp
@@ -1,13 +1,13 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
animation.cpp
-
+
(c)2002 Dan Potter
*/
-#include <tsu/animation.h>
-#include <tsu/drawable.h>
+#include "animation.h"
+#include "drawable.h"
Animation::Animation() {
}
diff --git a/src/anims/alphafader.cpp b/src/anims/alphafader.cpp
index 5cf6e00..c7f3b52 100644
--- a/src/anims/alphafader.cpp
+++ b/src/anims/alphafader.cpp
@@ -6,8 +6,8 @@
(c)2002 Dan Potter
*/
-#include <tsu/drawable.h>
-#include <tsu/anims/alphafader.h>
+#include "drawable.h"
+#include "anims/alphafader.h"
AlphaFader::AlphaFader(float fade_to, float delta) {
m_fade_to = fade_to;
diff --git a/src/anims/expxymover.cpp b/src/anims/expxymover.cpp
index ba8292d..63d7d90 100644
--- a/src/anims/expxymover.cpp
+++ b/src/anims/expxymover.cpp
@@ -6,8 +6,8 @@
(c)2002 Dan Potter
*/
-#include <tsu/drawable.h>
-#include <tsu/anims/expxymover.h>
+#include "drawable.h"
+#include "anims/expxymover.h"
ExpXYMover::ExpXYMover(float dx, float dy, float maxx, float maxy) {
m_dx = dx;
@@ -20,7 +20,7 @@ ExpXYMover::~ExpXYMover() { }
void ExpXYMover::nextFrame(Drawable *t) {
Vector p = t->getTranslate();
-
+
bool xfin = m_dx < 0 ? (p.x <= m_maxx) : (p.x >= m_maxx);
bool yfin = m_dy < 0 ? (p.y <= m_maxy) : (p.y >= m_maxy);
if (xfin && yfin) {
diff --git a/src/anims/logxymover.cpp b/src/anims/logxymover.cpp
index 9ffa66c..b22bb97 100644
--- a/src/anims/logxymover.cpp
+++ b/src/anims/logxymover.cpp
@@ -6,7 +6,7 @@
(c)2002 Dan Potter
*/
-#include <tsu/anims/logxymover.h>
+#include "anims/logxymover.h"
#include <math.h>
LogXYMover::LogXYMover(float dstx, float dsty) {
diff --git a/src/anims/tintfader.cpp b/src/anims/tintfader.cpp
index 9212dca..8da7bb8 100644
--- a/src/anims/tintfader.cpp
+++ b/src/anims/tintfader.cpp
@@ -6,8 +6,8 @@
Copyright (C)2003 Dan Potter
*/
-#include <tsu/drawable.h>
-#include <tsu/anims/tintfader.h>
+#include "drawable.h"
+#include "anims/tintfader.h"
TintFader::TintFader(const Color & fade_to, const Color & delta) {
m_fade_to = fade_to;
@@ -19,7 +19,7 @@ TintFader::~TintFader() { }
void TintFader::nextFrame(Drawable *t) {
Color c = t->getTint();
c += m_delta;
-
+
if (clamp(c)) {
c = m_fade_to;
complete(t);
diff --git a/src/drawable.cpp b/src/drawable.cpp
index b0cce91..ed88456 100644
--- a/src/drawable.cpp
+++ b/src/drawable.cpp
@@ -1,12 +1,12 @@
-/*
+/*
Tsunami for KallistiOS ##version##
drawable.cpp
-
+
(c)2002 Dan Potter
*/
-#include <tsu/drawable.h>
+#include "drawable.h"
#include <plx/matrix.h>
// Constructor / Destructor
@@ -20,13 +20,13 @@ Drawable::Drawable() {
m_r_prelative = true;
m_s_prelative = true;
m_a_prelative = true;
-
+
m_finished = false;
m_subs_finished = false;
m_parent = NULL;
}
-
+
Drawable::~Drawable() {
}
@@ -177,4 +177,3 @@ void Drawable::pushTransformMatrix() const {
void Drawable::popTransformMatrix() const {
plx_mat3d_pop();
}
-
diff --git a/src/drawables/banner.cpp b/src/drawables/banner.cpp
index 5cf833c..ca08704 100644
--- a/src/drawables/banner.cpp
+++ b/src/drawables/banner.cpp
@@ -1,17 +1,17 @@
/*
Tsunami for KallistiOS ##version##
-
+
banner.cpp
(c)2002 Dan Potter
*/
-#include <tsu/drawables/banner.h>
+#include "drawables/banner.h"
Banner::Banner(int list, Texture * texture) {
m_list = list;
m_texture = texture;
-
+
m_u1 = m_v2 = 0.0f;
m_u2 = m_v4 = 0.0f;
m_u3 = m_v1 = 1.0f;
@@ -99,4 +99,3 @@ void Banner::draw(int list) {
Drawable::draw(list);
}
-
diff --git a/src/drawables/label.cpp b/src/drawables/label.cpp
index 04f8763..73ce0e4 100644
--- a/src/drawables/label.cpp
+++ b/src/drawables/label.cpp
@@ -1,13 +1,13 @@
/*
Tsunami for KallistiOS ##version##
-
+
label.cpp
(c)2002 Dan Potter
*/
#include <plx/list.h>
-#include <tsu/drawables/label.h>
+#include "drawables/label.h"
Label::Label(Font * fh, const char *text, int size, bool centered, bool smear) {
m_fh = fh;
@@ -15,7 +15,7 @@ Label::Label(Font * fh, const char *text, int size, bool centered, bool smear) {
m_size = size;
m_centered = centered;
m_smear = smear;
-
+
}
Label::~Label() {
}
@@ -50,4 +50,3 @@ void Label::draw(int list) {
m_fh->draw(p.x, p.y, p.z, m_text);
}
}
-
diff --git a/src/font.cpp b/src/font.cpp
index c9111bc..b8e9b30 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -1,12 +1,12 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
font.cpp
(c)2002 Dan Potter
*/
-#include <tsu/font.h>
+#include "font.h"
Font::Font(const char *fn, int list) {
m_list = list;
@@ -153,7 +153,7 @@ void Font::smearDraw(float x, float y, float z, const char *text) {
plx_fcxt_draw(m_cxt, text);
plx_fcxt_setpos(m_cxt, x + 0, y + 0, z - 1.0f);
plx_fcxt_draw(m_cxt, text);
-
+
plx_fcxt_end(m_cxt);
plx_fcxt_setcolor4f(m_cxt, m_a, m_r, m_g, m_b);
}
diff --git a/src/genmenu.cpp b/src/genmenu.cpp
index 24a8bad..31b4099 100644
--- a/src/genmenu.cpp
+++ b/src/genmenu.cpp
@@ -6,7 +6,7 @@
Copyright (C)2003 Dan Potter
*/
-/*
+/*
This module implements a generic menu system. There are some pieces here
that were more integrated into Feet of Fury which have been commented out
for the moment until they can be more properly sorted out.
@@ -26,7 +26,7 @@
*/
-#include <tsu/genmenu.h>
+#include "genmenu.h"
#include <plx/list.h>
#include <kos/thread.h>
#include <arch/timer.h>
@@ -38,7 +38,7 @@ GenericMenu::GenericMenu() {
m_bgmFn[0] = 0;
m_usebgm = false;
m_cachebgm = false;
-
+
m_bg[0] = m_bg[1] = m_bg[2] = 0.0f;
m_exiting = false;
@@ -92,7 +92,7 @@ void GenericMenu::doMenu() {
// Did we get a quit-now request?
if (!m_exitSpeed)
return;
-
+
// We should be faded out now -- do three more frames to finish
// clearing out the PVR buffered scenes.
m_exitCount = 0;
@@ -438,4 +438,3 @@ void GenericMenu::setAutoRepeat(GenericMenu::Event::KeyConstant key, bool enable
else
m_autoRep &= ~(1 << key);
}
-
diff --git a/src/matrix.cpp b/src/matrix.cpp
index 1a5df4e..6627a89 100644
--- a/src/matrix.cpp
+++ b/src/matrix.cpp
@@ -1,13 +1,13 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
matrix.cpp
Copyright (C)2001,2002,2003 Dan Potter
Copyright (C)2002 Benoit Miller and Paul Boese
*/
-#include <tsu/matrix.h>
+#include "matrix.h"
#include <string.h>
/* Several pieces of this file were pulled from libparallax, which was
@@ -56,7 +56,7 @@ void Matrix::rotate(float angle, const Vector & axis) {
// Normalize the rotation vector
vx /= mag;
- vy /= mag;
+ vy /= mag;
vz /= mag;
xx = vx * vx;
diff --git a/src/matrixdouble.cpp b/src/matrixdouble.cpp
index 583cbfd..f06796a 100644
--- a/src/matrixdouble.cpp
+++ b/src/matrixdouble.cpp
@@ -1,14 +1,14 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
matrixdouble.cpp
Copyright (C)2001,2002,2003 Dan Potter
Copyright (C)2002 Benoit Miller and Paul Boese
*/
-#include <tsu/matrixdouble.h>
-#include <tsu/matrix.h>
+#include "matrixdouble.h"
+#include "matrix.h"
#include <string.h>
/* Several pieces of this file were pulled from libparallax, which was
@@ -59,7 +59,7 @@ void MatrixDouble::rotate(double angle, const VectorDouble & axis) {
// Normalize the rotation vector
vx /= mag;
- vy /= mag;
+ vy /= mag;
vz /= mag;
xx = vx * vx;
diff --git a/src/sound.cpp b/src/sound.cpp
index 3d4c8ca..4c92440 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -1,12 +1,12 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
sound.cpp
(c)2002 Dan Potter
*/
-#include <tsu/sound.h>
+#include "sound.h"
int Sound::m_default_vol = 240;
@@ -52,4 +52,3 @@ bool Sound::loadFromFile(const char *fn) {
void Sound::setDefaultVolume(int vol) {
m_default_vol = vol;
}
-
diff --git a/src/texture.cpp b/src/texture.cpp
index 2dffef6..49b2ad4 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -1,12 +1,12 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
texture.cpp
(c)2002 Dan Potter
*/
-#include <tsu/texture.h>
+#include "texture.h"
Texture::Texture(const char *fn, bool use_alpha, bool yflip) {
m_txr = NULL;
@@ -52,4 +52,3 @@ bool Texture::loadFromFile(const char *fn, bool use_alpha, bool flip) {
} else
return true;
}
-
diff --git a/src/trigger.cpp b/src/trigger.cpp
index 5bc0b09..0dbbcbb 100644
--- a/src/trigger.cpp
+++ b/src/trigger.cpp
@@ -1,13 +1,13 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
trigger.cpp
-
+
(c)2002 Dan Potter
*/
-#include <tsu/trigger.h>
-#include <tsu/animation.h>
+#include "trigger.h"
+#include "animation.h"
Trigger::Trigger() {
}
@@ -19,4 +19,3 @@ void Trigger::trigger(Drawable *t, Animation *a) {
// Autoclean ourselves once we've triggered
a->triggerRemove(this);
}
-
diff --git a/src/triggers/birth.cpp b/src/triggers/birth.cpp
index b00c985..e792498 100644
--- a/src/triggers/birth.cpp
+++ b/src/triggers/birth.cpp
@@ -1,13 +1,13 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
birth.cpp
-
+
Copyright (C)2003 Dan Potter
*/
-#include <tsu/triggers/birth.h>
-#include <tsu/drawable.h>
+#include "triggers/birth.h"
+#include "drawable.h"
Birth::Birth(Drawable * newDrawable, Drawable * target) {
m_newDrawable = newDrawable;
@@ -27,4 +27,3 @@ void Birth::trigger(Drawable *t, Animation *a) {
// Remove ourselves
Trigger::trigger(t, a);
}
-
diff --git a/src/triggers/death.cpp b/src/triggers/death.cpp
index 8d9a7f5..a4c0033 100644
--- a/src/triggers/death.cpp
+++ b/src/triggers/death.cpp
@@ -1,13 +1,13 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
death.cpp
-
+
(c)2002 Dan Potter
*/
-#include <tsu/triggers/death.h>
-#include <tsu/drawable.h>
+#include "triggers/death.h"
+#include "drawable.h"
Death::Death(Drawable * target) {
m_target = target;
@@ -26,4 +26,3 @@ void Death::trigger(Drawable *t, Animation *a) {
// Go the way of the dodo ourselves
Trigger::trigger(t, a);
}
-
diff --git a/src/vector.cpp b/src/vector.cpp
index 1b1f911..fbef587 100644
--- a/src/vector.cpp
+++ b/src/vector.cpp
@@ -1,14 +1,14 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
vector.cpp
Copyright (C)2004 Dan Potter
*/
-#include <tsu/vector.h>
...<truncated>...
hooks/post-receive
--
UNNAMED PROJECT
|
