Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. 9771d16b0a91c7b1745ef61e792197eac70ef541
|
From: ljsebald <ljs...@us...> - 2023-09-02 20:40:20
|
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 9771d16b0a91c7b1745ef61e792197eac70ef541 (commit)
via 875f6a6ba3a698bb6a7b17bb757e5fb403cdf2ca (commit)
from 2d197a40eb0844df1c19a472bc6b039d2a98f09d (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 9771d16b0a91c7b1745ef61e792197eac70ef541
Author: Lawrence Sebald <ljs...@us...>
Date: Sat Sep 2 16:39:43 2023 -0400
Update copyright notices.
commit 875f6a6ba3a698bb6a7b17bb757e5fb403cdf2ca
Author: Lawrence Sebald <ljs...@us...>
Date: Sat Sep 2 16:39:18 2023 -0400
Update Makefile for building outside kos-ports.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 18 ++++++------------
doc/readme.txt | 7 +++----
include/animation.h | 9 ++++-----
include/anims/alphafader.h | 2 +-
include/anims/expxymover.h | 2 +-
include/anims/logxymover.h | 2 +-
include/anims/tintfader.h | 2 +-
include/color.h | 7 +++----
include/color3.h | 7 +++----
include/drawable.h | 3 +--
include/drawables/banner.h | 5 ++---
include/drawables/label.h | 5 ++---
include/drawables/scene.h | 7 +++----
include/font.h | 11 +++++------
include/genmenu.h | 9 ++++-----
include/list.h | 10 +++++-----
include/matrix.h | 7 +++----
include/matrixdouble.h | 7 +++----
include/refcnt.h | 7 +++----
include/sound.h | 6 +++---
include/texture.h | 8 ++++----
include/trigger.h | 7 +++----
include/triggers/birth.h | 7 +++----
include/triggers/chainanim.h | 7 +++----
include/triggers/death.h | 7 +++----
include/triggers/oneshot.h | 7 +++----
include/vector.h | 7 +++----
include/vector3.h | 7 +++----
include/vectordouble.h | 7 +++----
src/animation.cpp | 2 +-
src/anims/alphafader.cpp | 2 +-
src/anims/expxymover.cpp | 2 +-
src/anims/logxymover.cpp | 2 +-
src/anims/tintfader.cpp | 2 +-
src/drawable.cpp | 2 +-
src/drawables/banner.cpp | 2 +-
src/drawables/label.cpp | 2 +-
src/font.cpp | 2 +-
src/genmenu.cpp | 2 +-
src/matrix.cpp | 4 ++--
src/matrixdouble.cpp | 4 ++--
src/sound.cpp | 2 +-
src/texture.cpp | 2 +-
src/trigger.cpp | 2 +-
src/triggers/birth.cpp | 2 +-
src/triggers/death.cpp | 2 +-
src/vector.cpp | 2 +-
src/vector3.cpp | 2 +-
src/vectordouble.cpp | 2 +-
49 files changed, 107 insertions(+), 134 deletions(-)
diff --git a/Makefile b/Makefile
index d5489a4..4156267 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
# Tsunami for KallistiOS ##version##
#
# Makefile
-# (c)2002 Dan Potter
+# Copyright (C) 2002 Megan Potter
-TARGET := libtsunami.a
+TARGET := libtsunami.a
+KOS_CFLAGS += -Iinclude
# Main sources
-OBJS_MAIN := $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
+OBJS_MAIN := $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
# Drawables
-OBJS_DRW := $(patsubst %.cpp,%.o,$(wildcard src/drawables/*.cpp))
+OBJS_DRW := $(patsubst %.cpp,%.o,$(wildcard src/drawables/*.cpp))
# Animations
OBJS_ANIMS := $(patsubst %.cpp,%.o,$(wildcard src/anims/*.cpp))
@@ -17,14 +18,7 @@ OBJS_ANIMS := $(patsubst %.cpp,%.o,$(wildcard src/anims/*.cpp))
# Triggers
OBJS_TRIGS := $(patsubst %.cpp,%.o,$(wildcard src/triggers/*.cpp))
-OBJS := $(OBJS_MAIN) $(OBJS_DRW) $(OBJS_ANIMS) $(OBJS_TRIGS)
-
-defaultall: create_kos_link $(OBJS) subdirs linklib
-
-# creates the kos link to the headers
-create_kos_link:
- rm -f ../include/tsu
- ln -s ../libtsunami/include ../include/tsu
+OBJS := $(OBJS_MAIN) $(OBJS_DRW) $(OBJS_ANIMS) $(OBJS_TRIGS)
# Grab the shared Makefile pieces
include $(KOS_BASE)/addons/Makefile.prefab
diff --git a/doc/readme.txt b/doc/readme.txt
index 36488ec..6d55e23 100644
--- a/doc/readme.txt
+++ b/doc/readme.txt
@@ -1,5 +1,5 @@
Tsunami for KOS ##version##
-(c)2002 Dan Potter
+Copyright (C) 2002 Megan Potter
What is it?
@@ -18,7 +18,7 @@ itself".
Tsunami provides a high level way to describe what a scene looks like, and
then you simply call into it to have it manage everything each frame. Each
scene is composed of one or more "drawables" (one of which is the whole scene
-container). Each of these drawables has a screen position and other
+container). Each of these drawables has a screen position and other
attributes that describe its state. Additionally, each drawable can contain
sub-drawables which can be positioned, rotated, etc, relative to its
parents. Furthermore, each drawable knows how to draw itself in position
@@ -41,7 +41,7 @@ of the object to some new value. Of course, all of these can be done at
once and in tandem with the object's intrinsic animation(s), if any.
Triggers provide a simple mechanism to have a multi-legged animation. The
-current trigger mechanism allows for you to do things like switch out an
+current trigger mechanism allows for you to do things like switch out an
animation or signal that a drawable is dead in the scene upon the completion
of another animation, but I'm also planning to add triggers based on time
and other events (like controller inputs).
@@ -58,4 +58,3 @@ with the reference counted objects pervasively, dodging the bullet that
things like CComPtr setup in the MS world (i.e. mixing of raw pointers and
auto_ptrs, causing the programmer to have to defacto manually reference
count anyway).
-
diff --git a/include/animation.h b/include/animation.h
index 4cad42f..6523759 100644
--- a/include/animation.h
+++ b/include/animation.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
animation.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -33,7 +33,7 @@ public:
// Move to the next frame of animation
virtual void nextFrame(Drawable *t);
-protected:
+protected:
/// Trigger any triggers
virtual void trigger(Drawable *d);
@@ -45,4 +45,3 @@ private:
};
#endif /* __TSUNAMI_ANIMATION_H */
-
diff --git a/include/anims/alphafader.h b/include/anims/alphafader.h
index fa4bd5b..703474b 100644
--- a/include/anims/alphafader.h
+++ b/include/anims/alphafader.h
@@ -3,7 +3,7 @@
alphafader.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
diff --git a/include/anims/expxymover.h b/include/anims/expxymover.h
index 277371d..aabf8c5 100644
--- a/include/anims/expxymover.h
+++ b/include/anims/expxymover.h
@@ -3,7 +3,7 @@
expxymover.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
diff --git a/include/anims/logxymover.h b/include/anims/logxymover.h
index 7d2a15a..dce45ad 100644
--- a/include/anims/logxymover.h
+++ b/include/anims/logxymover.h
@@ -3,7 +3,7 @@
logxymover.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
diff --git a/include/anims/tintfader.h b/include/anims/tintfader.h
index 0a241d5..1202515 100644
--- a/include/anims/tintfader.h
+++ b/include/anims/tintfader.h
@@ -3,7 +3,7 @@
tintfader.h
- Copyright (C)2003 Dan Potter
+ Copyright (C) 2003 Megan Potter
*/
diff --git a/include/color.h b/include/color.h
index 4bd6c96..d82a51b 100644
--- a/include/color.h
+++ b/include/color.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
color.h
- Copyright (C)2003 Dan Potter
+ Copyright (C) 2003 Megan Potter
*/
@@ -81,4 +81,3 @@ struct Color {
};
#endif /* __TSUNAMI_COLOR_H */
-
diff --git a/include/color3.h b/include/color3.h
index 3a8281f..5e369c5 100644
--- a/include/color3.h
+++ b/include/color3.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
color3.h
- Copyright (C)2003,2004 Dan Potter
+ Copyright (C) 2003, 2004 Megan Potter
*/
@@ -56,4 +56,3 @@ struct Color3 {
};
#endif /* __TSUNAMI_COLOR3_H */
-
diff --git a/include/drawable.h b/include/drawable.h
index 468dcc6..be71c3c 100644
--- a/include/drawable.h
+++ b/include/drawable.h
@@ -3,7 +3,7 @@
drawable.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -137,4 +137,3 @@ private:
};
#endif /* __TSUNAMI_DRAWABLE_H */
-
diff --git a/include/drawables/banner.h b/include/drawables/banner.h
index df5d61c..20277ea 100644
--- a/include/drawables/banner.h
+++ b/include/drawables/banner.h
@@ -1,9 +1,9 @@
/*
Tsunami for KallistiOS ##version##
-
+
banner.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -43,4 +43,3 @@ private:
};
#endif /* __TSUNAMI_DRW_BANNER_H */
-
diff --git a/include/drawables/label.h b/include/drawables/label.h
index 26a2051..4444dd5 100644
--- a/include/drawables/label.h
+++ b/include/drawables/label.h
@@ -1,9 +1,9 @@
/*
Tsunami for KallistiOS ##version##
-
+
label.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -32,4 +32,3 @@ private:
};
#endif /* __TSUNAMI_DRW_LABEL_H */
-
diff --git a/include/drawables/scene.h b/include/drawables/scene.h
index 7d5dcab..dd9c5aa 100644
--- a/include/drawables/scene.h
+++ b/include/drawables/scene.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
scene.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -30,4 +30,3 @@ public:
};
#endif /* __TSUNAMI_DRW_SCENE_H */
-
diff --git a/include/font.h b/include/font.h
index d798945..a5b5ba3 100644
--- a/include/font.h
+++ b/include/font.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
font.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -22,7 +22,7 @@ public:
bool loadFromFile(const char * fn);
void setFilter(int type);
-
+
void setColor(float r, float g, float b);
void setAlpha(float a);
void setSize(float size);
@@ -37,7 +37,7 @@ public:
void drawCharSetPos(const Vector &v);
float drawChar(int ch);
void drawCharEnd();
-
+
void getCharExtents(int c, float * l, float * u, float * r, float * d);
void getTextSize(const char *text, float * w, float * h);
void upperleftCoords(const char * text, float *x, float *y);
@@ -55,4 +55,3 @@ private:
};
#endif /* __FONTHELPER_H */
-
diff --git a/include/genmenu.h b/include/genmenu.h
index 9163285..4d32b87 100644
--- a/include/genmenu.h
+++ b/include/genmenu.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
genmenu.h
- Copyright (C)2003 Dan Potter
+ Copyright (C) 2003 Megan Potter
*/
#ifndef __TSUNAMI_GENMENU_H
@@ -79,7 +79,7 @@ public:
// Set a post-doMenu delay in case sounds may still be playing
void setPostDelay(int ms);
-
+
protected:
// Called once per frame to update the screen. Generally no need
// to override this method.
@@ -171,4 +171,3 @@ protected:
};
#endif /* __GENMENU_H */
-
diff --git a/include/list.h b/include/list.h
index 4b54a12..b9a9281 100644
--- a/include/list.h
+++ b/include/list.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
list.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -96,7 +96,7 @@ public:
List() {
TAILQ_INIT(&m_list);
}
-
+
virtual ~List() {
delAll();
}
@@ -119,7 +119,7 @@ public:
/// reference will be removed if it is found.
bool del(T * item) {
ListNode<T> * n;
-
+
TAILQ_FOREACH(n, &m_list, m_listptr) {
if (n->getData() == item) {
n->remove();
@@ -155,7 +155,7 @@ public:
private:
friend class ListNode<T>;
-
+
TAILQ_HEAD(listnodehead, ListNode<T>) m_list;
public:
diff --git a/include/matrix.h b/include/matrix.h
index e163746..d09cddc 100644
--- a/include/matrix.h
+++ b/include/matrix.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
matrix.h
- Copyright (C)2003 Dan Potter
+ Copyright (C) 2003 Megan Potter
*/
@@ -80,4 +80,3 @@ public:
};
#endif /* __TSUNAMI_MATRIX_H */
-
diff --git a/include/matrixdouble.h b/include/matrixdouble.h
index 180ab61..d7b4d68 100644
--- a/include/matrixdouble.h
+++ b/include/matrixdouble.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
matrixdouble.h
- Copyright (C)2003,2004 Dan Potter
+ Copyright (C) 2003, 2004 Megan Potter
*/
@@ -80,4 +80,3 @@ public:
};
#endif /* __TSUNAMI_MATRIXDOUBLE_H */
-
diff --git a/include/refcnt.h b/include/refcnt.h
index bd0f11b..0b6bf0f 100644
--- a/include/refcnt.h
+++ b/include/refcnt.h
@@ -1,9 +1,9 @@
-/*
+/*
Tsunami for KallistiOS ##version##
-
+
refcnt.h
- (c)2002 Dan Potter
+ Copyright (C) 2002 Megan Potter
*/
@@ -131,4 +131,3 @@ private:
...<truncated>...
hooks/post-receive
--
UNNAMED PROJECT
|
