[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx jni/GzzGL-jni.cxx jni/paper-jni.cxx lib...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gfx jni/GzzGL-jni.cxx jni/paper-jni.cxx lib... |
Date: |
Sat, 11 Jan 2003 06:47:52 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/01/11 06:47:50
Modified files:
gfx/jni : GzzGL-jni.cxx paper-jni.cxx
gfx/libutil : ObjectStorer.hxx
Log message:
More debugging in GL
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/paper-jni.cxx.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/ObjectStorer.hxx.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -u gzz/gfx/jni/GzzGL-jni.cxx:1.74 gzz/gfx/jni/GzzGL-jni.cxx:1.75
--- gzz/gfx/jni/GzzGL-jni.cxx:1.74 Sun Dec 29 15:33:12 2002
+++ gzz/gfx/jni/GzzGL-jni.cxx Sat Jan 11 06:47:50 2003
@@ -44,15 +44,15 @@
typedef std::vector<GLubyte> ByteVector;
-ObjectStorer<Os::RenderingSurface> windows;
-ObjectStorer<Image> images;
-ObjectStorer<Mosaic::MosaicTile> imagetiles;
-ObjectStorer<RealFont> fonts;
-ObjectStorer<Renderable0> renderable0s;
-ObjectStorer<Renderable1> renderable1s;
-ObjectStorer<Renderable2> renderable2s;
-ObjectStorer<Renderable3> renderable3s;
-ObjectStorer<ByteVector> bytevectors;
+ObjectStorer<Os::RenderingSurface> windows("windows");
+ObjectStorer<Image> images("images");
+ObjectStorer<Mosaic::MosaicTile> imagetiles("imagetiles");
+ObjectStorer<RealFont> fonts("fonts");
+ObjectStorer<Renderable0> renderable0s("renderable0s");
+ObjectStorer<Renderable1> renderable1s("renderable1s");
+ObjectStorer<Renderable2> renderable2s("renderable2s");
+ObjectStorer<Renderable3> renderable3s("renderable3s");
+ObjectStorer<ByteVector> bytevectors("bytevectors");
extern ObjectStorer<Paper::Paper> papers;
Index: gzz/gfx/jni/paper-jni.cxx
diff -u gzz/gfx/jni/paper-jni.cxx:1.6 gzz/gfx/jni/paper-jni.cxx:1.7
--- gzz/gfx/jni/paper-jni.cxx:1.6 Wed Oct 23 15:50:17 2002
+++ gzz/gfx/jni/paper-jni.cxx Sat Jan 11 06:47:50 2003
@@ -18,7 +18,7 @@
<<" "<<gluErrorString(er)<<"\n"; \
}
-ObjectStorer<Paper::Paper> papers;
+ObjectStorer<Paper::Paper> papers("papers");
JNIEXPORT jint JNICALL Java_gzz_gfx_gl_Paper_impl_1create
(JNIEnv *, jclass) {
Index: gzz/gfx/libutil/ObjectStorer.hxx
diff -u gzz/gfx/libutil/ObjectStorer.hxx:1.9
gzz/gfx/libutil/ObjectStorer.hxx:1.10
--- gzz/gfx/libutil/ObjectStorer.hxx:1.9 Wed Dec 4 05:54:22 2002
+++ gzz/gfx/libutil/ObjectStorer.hxx Sat Jan 11 06:47:50 2003
@@ -7,6 +7,7 @@
using std::vector;
using std::cout;
using std::cerr;
+ using std::string;
// XXX NOT ENOUGH SAFETY CHECKS FOR REMOVE!
// GET MUSTN'T CHECK; MUST CHECK RANGE BEFORE.
@@ -14,8 +15,9 @@
*/
template<class T> class ObjectStorer {
vector<T *> vec;
+ string name;
public:
- ObjectStorer() {
+ ObjectStorer(string name="") : name(name) {
// to avoid '0' as id
vec.insert(vec.end(), 0);
}
@@ -46,11 +48,11 @@
void remove(int p) {
if(p == 0) return;
if((unsigned)p >= vec.size()) {
- cerr << "Trying to delete element past end "<<p<<"\n";
+ cerr << name<<": Trying to delete element past end "<<p<<"\n";
return;
}
if(vec[p] == NULL) {
- cerr << "Trying to delete null element! "<<p<<"\n";
+ cerr << name<<": Trying to delete null element! "<<p<<"\n";
return;
}
delete vec[p];
@@ -61,11 +63,11 @@
*/
T *get(int p) {
if((unsigned)p >= vec.size()) {
- cerr << "Trying to get element past end\n";
+ cerr << name<<": Trying to get element past end\n";
return 0;
}
if(vec[p] == NULL) {
- cerr << "Trying to get null element!\n";
+ cerr << name<<": Trying to get null element!\n";
return 0;
}
return vec[p];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx jni/GzzGL-jni.cxx jni/paper-jni.cxx lib...,
Tuomas J. Lukka <=