From 7d2ff44f1f9881d336b59925fa0617f566082f03 Mon Sep 17 00:00:00 2001
From: David Kamphausen <david.kamphausen@web.de>
Date: Wed, 2 Jul 2014 17:10:05 +0200
Subject: [PATCH] moved files

---
 CMakeLists.txt                         |  15 ++-
 lib/ag_config.cc                       | 119 +++++++++++------------
 lib/ag_config.h                        |   3 -
 lib/ag_fs.cc                           | 127 -------------------------
 lib/ag_gauss.h                         |  19 ----
 lib/ag_main.h                          |   2 +-
 lib/ag_mutex.h                         |   9 +-
 lib/game/ant_game_app.cc               |   3 -
 lib/{ => gui}/ant_black_fade_widget.cc |   0
 lib/{ => gui}/ant_black_fade_widget.h  |   0
 lib/{ => video}/GLee.c                 |   0
 lib/{ => video}/GLee.h                 |   0
 lib/{ => video}/ag_clip.cc             |   0
 lib/{ => video}/ag_clip.h              |   0
 lib/{ => video}/ag_clip_painttarget.cc |   0
 lib/{ => video}/ag_clip_painttarget.h  |   0
 lib/{ => video}/ag_color.cc            |   0
 lib/{ => video}/ag_color.h             |   0
 lib/{ => video}/ag_draw.h              |   0
 lib/{ => video}/ag_fbo.cc              |   0
 lib/{ => video}/ag_fbo.h               |   0
 lib/{ => video}/ag_font.cc             |   0
 lib/{ => video}/ag_font.h              |   0
 lib/{ => video}/ag_fontengine.cc       |   0
 lib/{ => video}/ag_fontengine.h        |   0
 lib/{ => video}/ag_glpainter.cc        |   0
 lib/{ => video}/ag_glpainter.h         |   0
 lib/{ => video}/ag_glscreen.cc         |   0
 lib/{ => video}/ag_glscreen.h          |   0
 lib/{ => video}/ag_gltexture.cc        |   0
 lib/{ => video}/ag_gltexture.h         |   0
 lib/{ => video}/ag_gradient.cc         |   0
 lib/{ => video}/ag_painter.cc          |   0
 lib/{ => video}/ag_painter.h           |   0
 lib/{ => video}/ag_painttarget.h       |   0
 lib/{ => video}/ag_png.cc              |   0
 lib/{ => video}/ag_png.h               |   0
 lib/{ => video}/ag_projection.cc       |   0
 lib/{ => video}/ag_projection.h        |   0
 lib/{ => video}/ag_rendercontext.cc    |   0
 lib/{ => video}/ag_rendercontext.h     |   0
 lib/{ => video}/ag_screen.cc           |   0
 lib/{ => video}/ag_screen.h            |   0
 lib/{ => video}/ag_sdlpainter.cc       |   0
 lib/{ => video}/ag_sdlpainter.h        |   0
 lib/{ => video}/ag_sdlscreen.cc        |   0
 lib/{ => video}/ag_sdlscreen.h         |   0
 lib/{ => video}/ag_sdlsurface.h        |   0
 lib/{ => video}/ag_sgeexport.h         |   0
 lib/{ => video}/ag_surface.cc          |   0
 lib/{ => video}/ag_surface.h           |   0
 lib/{ => video}/ag_surface_internal.cc |   0
 lib/{ => video}/ag_surface_internal.h  |   0
 lib/{ => video}/ag_surfacemanager.cc   |   0
 lib/{ => video}/ag_surfacemanager.h    |   0
 lib/{ => video}/ag_texture.cc          |   0
 lib/{ => video}/ag_texture.h           |   0
 lib/{ => video}/ag_texturecache.cc     |   0
 lib/{ => video}/ag_texturecache.h      |   0
 lib/{ => video}/ag_video.cc            |   0
 lib/{ => video}/ag_video.h             |   0
 lib/{ => video}/ag_video_base.cc       |   0
 lib/{ => video}/ag_video_base.h        |   0
 lib/{ => video}/ant_frustum.cc         |   0
 lib/{ => video}/ant_frustum.h          |   0
 lib/{ => video}/sge_config.h           |   0
 lib/{ => video}/sge_internal.h         |   0
 lib/{ => video}/sge_primitives.cc      |   0
 lib/{ => video}/sge_primitives.h       |   0
 lib/{ => video}/sge_surface.cc         |   0
 lib/{ => video}/sge_surface.h          |   0
 71 files changed, 80 insertions(+), 217 deletions(-)
 rename lib/{ => gui}/ant_black_fade_widget.cc (100%)
 rename lib/{ => gui}/ant_black_fade_widget.h (100%)
 rename lib/{ => video}/GLee.c (100%)
 rename lib/{ => video}/GLee.h (100%)
 rename lib/{ => video}/ag_clip.cc (100%)
 rename lib/{ => video}/ag_clip.h (100%)
 rename lib/{ => video}/ag_clip_painttarget.cc (100%)
 rename lib/{ => video}/ag_clip_painttarget.h (100%)
 rename lib/{ => video}/ag_color.cc (100%)
 rename lib/{ => video}/ag_color.h (100%)
 rename lib/{ => video}/ag_draw.h (100%)
 rename lib/{ => video}/ag_fbo.cc (100%)
 rename lib/{ => video}/ag_fbo.h (100%)
 rename lib/{ => video}/ag_font.cc (100%)
 rename lib/{ => video}/ag_font.h (100%)
 rename lib/{ => video}/ag_fontengine.cc (100%)
 rename lib/{ => video}/ag_fontengine.h (100%)
 rename lib/{ => video}/ag_glpainter.cc (100%)
 rename lib/{ => video}/ag_glpainter.h (100%)
 rename lib/{ => video}/ag_glscreen.cc (100%)
 rename lib/{ => video}/ag_glscreen.h (100%)
 rename lib/{ => video}/ag_gltexture.cc (100%)
 rename lib/{ => video}/ag_gltexture.h (100%)
 rename lib/{ => video}/ag_gradient.cc (100%)
 rename lib/{ => video}/ag_painter.cc (100%)
 rename lib/{ => video}/ag_painter.h (100%)
 rename lib/{ => video}/ag_painttarget.h (100%)
 rename lib/{ => video}/ag_png.cc (100%)
 rename lib/{ => video}/ag_png.h (100%)
 rename lib/{ => video}/ag_projection.cc (100%)
 rename lib/{ => video}/ag_projection.h (100%)
 rename lib/{ => video}/ag_rendercontext.cc (100%)
 rename lib/{ => video}/ag_rendercontext.h (100%)
 rename lib/{ => video}/ag_screen.cc (100%)
 rename lib/{ => video}/ag_screen.h (100%)
 rename lib/{ => video}/ag_sdlpainter.cc (100%)
 rename lib/{ => video}/ag_sdlpainter.h (100%)
 rename lib/{ => video}/ag_sdlscreen.cc (100%)
 rename lib/{ => video}/ag_sdlscreen.h (100%)
 rename lib/{ => video}/ag_sdlsurface.h (100%)
 rename lib/{ => video}/ag_sgeexport.h (100%)
 rename lib/{ => video}/ag_surface.cc (100%)
 rename lib/{ => video}/ag_surface.h (100%)
 rename lib/{ => video}/ag_surface_internal.cc (100%)
 rename lib/{ => video}/ag_surface_internal.h (100%)
 rename lib/{ => video}/ag_surfacemanager.cc (100%)
 rename lib/{ => video}/ag_surfacemanager.h (100%)
 rename lib/{ => video}/ag_texture.cc (100%)
 rename lib/{ => video}/ag_texture.h (100%)
 rename lib/{ => video}/ag_texturecache.cc (100%)
 rename lib/{ => video}/ag_texturecache.h (100%)
 rename lib/{ => video}/ag_video.cc (100%)
 rename lib/{ => video}/ag_video.h (100%)
 rename lib/{ => video}/ag_video_base.cc (100%)
 rename lib/{ => video}/ag_video_base.h (100%)
 rename lib/{ => video}/ant_frustum.cc (100%)
 rename lib/{ => video}/ant_frustum.h (100%)
 rename lib/{ => video}/sge_config.h (100%)
 rename lib/{ => video}/sge_internal.h (100%)
 rename lib/{ => video}/sge_primitives.cc (100%)
 rename lib/{ => video}/sge_primitives.h (100%)
 rename lib/{ => video}/sge_surface.cc (100%)
 rename lib/{ => video}/sge_surface.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e00c70..637642b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ link_libraries (
 )
 include_directories(${SDL_INCLUDE_DIR} ${RUBY_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} 
   ${CMAKE_CURRENT_SOURCE_DIR}/lib
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/video
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/gui
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/generator
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/sound
@@ -78,7 +79,13 @@ SET(CMAKE_SWIG_FLAGS "")
 #set_target_properties(example PROPERTIES PREFIX "")
 
 
-FILE(GLOB MYLIB_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} lib/*.cc lib/*.c lib/gui/*.cc lib/sound/*.cc
+FILE(GLOB MYLIB_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
+  lib/*.cc 
+  lib/*.c 
+  lib/video/*.c
+  lib/video/*.cc
+  lib/gui/*.cc 
+  lib/sound/*.cc
   lib/3dengine/*.cc
   lib/generator/*.cc
   lib/game/*.cc
@@ -89,7 +96,11 @@ FILE(GLOB MYLIB_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} lib/*.cc lib/*.c li
   lib/game/path/*.cc
   lib/game/widgets/*.cc
 )
-FILE(GLOB MYLIB_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} lib/*.h lib/gui/*.h lib/sound/*.h
+FILE(GLOB MYLIB_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} 
+  lib/*.h 
+  lib/video/*.h 
+  lib/gui/*.h 
+  lib/sound/*.h
   lib/3dengine/*.h
   lib/game/*.h
   lib/players/*.h
diff --git a/lib/ag_config.cc b/lib/ag_config.cc
index 96c8c35..3425547 100644
--- a/lib/ag_config.cc
+++ b/lib/ag_config.cc
@@ -2,46 +2,44 @@
 #include "ag_xml.h"
 #include "ag_fs.h"
 
-// TODO: AGConfig should switch to a ruby-based configuration (maybe YAML)
 // TODO: commenting should be possible !! (no overwriting)
 
 AGConfig::AGConfig()
-  {
-    Document doc("config.xml");
+{
+  Document doc("config.xml");
 
-    Node &root=doc.root();
-    AGString comment;
-    for(Node::iterator i=root.begin();i!=root.end();i++)
+  Node &root=doc.root();
+  AGString comment;
+  for(Node::iterator i=root.begin();i!=root.end();i++)
+  {
+    if((*i)->get("name")=="")
+    {
+      AGString c=(*i)->getContent();
+      if(c.substr(0,4)=="<!--")
       {
-        if((*i)->get("name")=="")
-          {
-            AGString c=(*i)->getContent();
-            if(c.substr(0,4)=="<!--")
-              {
-                comment=c;
-              }
-          }
-        else
-          {
-            singleValue[(*i)->get("name")]=(*i)->get("value");
-            comments[(*i)->get("name")]=comment;
-            comment="";
-          }
+        comment=c;
       }
-    //  writeToDisc();
+    }
+    else
+    {
+      singleValue[(*i)->get("name")]=(*i)->get("value");
+      comments[(*i)->get("name")]=comment;
+      comment="";
+    }
   }
+}
 
 AGString AGConfig::get(const AGString &pValue,const AGString &pDefault,const AGString &pComment)
+{
+  AGString v=get(pValue);
+  if(v=="")
   {
-    AGString v=get(pValue);
-    if(v=="")
-      {
-        comments[pValue]=pComment;
-        set(pValue,pDefault);
-        v=pDefault;
-      }
-    return v;
+    comments[pValue]=pComment;
+    set(pValue,pDefault);
+    v=pDefault;
   }
+  return v;
+}
 
 
 
@@ -55,49 +53,48 @@ AGString AGConfig::get(const AGString &pValue) const
 }
 
 void AGConfig::set(const AGString &pName,const AGString &pValue)
+{
+  AGString old=singleValue[pName];
+  if(old!=pValue)
   {
-    AGString old=singleValue[pName];
-    if(old!=pValue)
-      {
-        singleValue[pName]=pValue;
-        writeToDisc();
-      }
+    singleValue[pName]=pValue;
+    writeToDisc();
   }
+}
 
 void AGConfig::writeToDisc()
+{
+  Document doc;
+  Node &root=doc.root();
+  root.setName("config");
+  for(std::map<AGString,AGString>::const_iterator i=singleValue.begin();i!=singleValue.end();i++)
   {
-    Document doc;
-    Node &root=doc.root();
-    root.setName("config");
-    for(std::map<AGString,AGString>::const_iterator i=singleValue.begin();i!=singleValue.end();i++)
-      {
-        if(comments[i->first]!="")
-          {
-            Node &n=root.addChild("");
-            n.setContent(AGString("\n")+comments[i->first]+"\n");
-          }
-
-        Node &n=root.addChild("option");
-        n.set("name",i->first);
-        n.set("value",i->second);
-      }
+    if(comments[i->first]!="")
+    {
+      Node &n=root.addChild("");
+      n.setContent(AGString("\n")+comments[i->first]+"\n");
+    }
 
-    saveFile("config.xml",doc.toString(true));
+    Node &n=root.addChild("option");
+    n.set("name",i->first);
+    n.set("value",i->second);
   }
 
+  saveFile("config.xml",doc.toString(true));
+}
+
 
 
 AGConfig *gConfig=0;
 AGConfig *getConfig()
-  {
-    if(!gConfig)
-      gConfig=new AGConfig;
-    return gConfig;
-  }
+{
+  if(!gConfig)
+    gConfig=new AGConfig;
+  return gConfig;
+}
 
 void updateConfig()
-  {
-    checkedDelete(gConfig);
-    gConfig=0;
-    //  getConfig();
-  }
+{
+  checkedDelete(gConfig);
+  gConfig=0;
+}
diff --git a/lib/ag_config.h b/lib/ag_config.h
index 3e5a258..db60a69 100644
--- a/lib/ag_config.h
+++ b/lib/ag_config.h
@@ -47,7 +47,4 @@ class AGEXPORT AGConfig
 AGEXPORT AGConfig *getConfig();
 AGEXPORT void updateConfig();
 
-
-//#define EXPORT __declspec(dllexport)
-
 #endif
diff --git a/lib/ag_fs.cc b/lib/ag_fs.cc
index 2413be3..33081e7 100644
--- a/lib/ag_fs.cc
+++ b/lib/ag_fs.cc
@@ -18,9 +18,6 @@
  * License along with this program.
  */
 
-
-// TODO: Code-review !!!
-
 #include <string>
 #include <list>
 #include <assert.h>
@@ -47,66 +44,18 @@ static std::list<AGString> gFilesystemPathes;
 void addPath(const AGString &pName)
   {
     gFilesystemPathes.push_back(pName);
-#ifdef USE_PHYSFS
-    TRACE;
-    PHYSFS_addToSearchPath(pName.c_str(),1);
-    char **p=PHYSFS_getSearchPath();
-    for(;*p;p++)
-      {
-        dbout(0,*p);
-
-      }
-#endif
     updateConfig();
   }
 
 void addPathFront(const AGString &pName)
   {
     gFilesystemPathes.push_front(pName);
-#ifdef USE_PHYSFS
-    TRACE;
-    PHYSFS_addToSearchPath(pName.c_str(),1);
-    char **p=PHYSFS_getSearchPath();
-    for(;*p;p++)
-      {
-        dbout(0,*p);
-
-      }
-#endif
     updateConfig();
   }
 
 
 void initFS(const char *argv0)
   {
-#ifdef USE_PHYSFS
-    TRACE;
-    PHYSFS_init(argv0);
-    PHYSFS_setSaneConfig("Antargis","Antargis","ZIP",false,false);
-    FSinited=true;
-    const char *wp=PHYSFS_getWriteDir();
-    dbout(0,"writedir:"<<wp);
-
-    dbout(0,"searchpath:");
-
-    PHYSFS_addToSearchPath("./data/",1);
-    PHYSFS_addToSearchPath("/usr/share/antargisgui/",1);
-    PHYSFS_addToSearchPath("/usr/share/antargisgui/pics",1);
-    PHYSFS_addToSearchPath("/usr/local/share/antargisgui/",1);
-    PHYSFS_addToSearchPath("/usr/local/share/antargisgui/pics",1);
-    PHYSFS_addToSearchPath("./",1);
-    PHYSFS_addToSearchPath("../",1);
-
-    char **p=PHYSFS_getSearchPath();
-    for(;*p;p++)
-      {
-        dbout(0,*p);
-
-      }
-
-    dbout(0,"--");
-
-#endif
     addPath("data");
     addPath("data/fonts");
 #ifndef WIN32
@@ -238,7 +187,6 @@ AGString findFile(const AGString &pName)
           return findFile(pName.substr(0,pName.length()-3)+"jpg");
       }
 
-    //  throw std::runtime_error("File not found!");
     return "";
   }
 
@@ -256,9 +204,6 @@ std::string loadFromPath(const std::string &pName)
           return r;
       }
 
-    //  if(mFsPaths.size()==0)
-    //    throw std::runtime_error("Not yet inited fs-paths!");
-
     for(std::list<AGString>::iterator i=gFilesystemPathes.begin();i!=gFilesystemPathes.end();i++)
       cdebug("path:"<<*i);
 
@@ -270,39 +215,6 @@ std::string loadFromPath(const std::string &pName)
 AGString loadFile(const AGString &pName)
   {
     return loadFromPath(checkFileName(pName));
-#ifdef USE_PHYSFS
-    TRACE;
-    assert(FSinited);
-
-    std::string r=directLoad(pName);
-    if(r.length()!=0)
-      return r;
-
-    if(!fileExists(pName))
-      {
-        std::string r=directLoad(pName);
-        if(r.length()==0)
-          std::cerr<<"File '"<<pName<<"' does not exist!"<<std::endl;
-        return r;
-      }
-
-    std::cerr<<"File probably doesn't exist:"<<pName<<std::endl;
-    PHYSFS_file *f=PHYSFS_openRead(pName.c_str());
-    std::string o;
-
-    char buf[1001];
-    PHYSFS_uint32 c=0;
-
-    do
-      {
-        c=PHYSFS_read(f,buf,1,1000);
-        o+=std::string(buf,c);
-      }
-    while(c);
-
-    PHYSFS_close(f);
-    return o;
-#endif
   }
 
 #ifdef WIN32
@@ -428,22 +340,6 @@ AGString getWriteDir()
 
 bool saveFile(const AGString &pName,const AGString &pContent)
   {
-#ifdef USE_PHYSFS
-    TRACE;
-    assert(FSinited);
-
-    PHYSFS_file *f=PHYSFS_openWrite(pName.c_str());
-
-    if(!f)
-      {
-        dbout(0,"Error saving file:"<<pName);
-      }
-    assert(f);
-
-    PHYSFS_write(f,pContent.c_str(),1,pContent.length());
-
-    PHYSFS_close(f);
-#else
     std::string n=checkFileName(getWriteDir()+"/"+pName);
 
     checkParentDirs(n);
@@ -455,7 +351,6 @@ bool saveFile(const AGString &pName,const AGString &pContent)
     fwrite(pContent.c_str(),pContent.length(),1,f);
     fclose(f);
 
-#endif
     return true;
   }
 
@@ -477,31 +372,10 @@ bool fileExists(const AGString &pName)
       }
 
     return found;
-#ifdef USE_PHYSFS
-    TRACE;
-    return PHYSFS_exists(pName.c_str());
-#endif
   }
 
 std::vector<AGString> getDirectoryInternal(const AGString &pDir)
   {
-#ifdef USE_PHYSFS
-    TRACE;
-    char **files= PHYSFS_enumerateFiles(pDir.c_str());
-    std::vector<std::string> v;
-
-    char **p=files;
-
-    while(*p)
-      {
-        v.push_back(*p);
-        p++;
-      }
-
-    PHYSFS_freeList(files);
-    return v;
-#else
-
     std::vector<AGString> v;
 
 #ifdef WIN32
@@ -546,7 +420,6 @@ std::vector<AGString> getDirectoryInternal(const AGString &pDir)
 #endif
 
     return v;
-#endif
   }
 
 std::vector<AGString> getDirectory(const AGString &pDir)
diff --git a/lib/ag_gauss.h b/lib/ag_gauss.h
index 9748e68..9604028 100644
--- a/lib/ag_gauss.h
+++ b/lib/ag_gauss.h
@@ -8,10 +8,6 @@
 template<class TMatrix>
 bool gauss(TMatrix &a,TMatrix &b,int size)
   {
-    //TRACE;
-    // cdebug("A:\n"<<a.toString());
-    // cdebug("B:\n"<<b.toString());
-
     // lower-left triangle
     for(int c=0;c<size-1;c++) // cols
       {
@@ -23,7 +19,6 @@ bool gauss(TMatrix &a,TMatrix &b,int size)
             for(k=1;k+c<size;k++)
               if(fabs(b.get(c,c+k))>0)
                 {
-                  //cdebug("SWAP:"<<c<<" and "<<c+k);
                   // swap rows
                   b.swapRows(c,c+k);
                   a.swapRows(c,c+k);
@@ -40,20 +35,13 @@ bool gauss(TMatrix &a,TMatrix &b,int size)
                 float f=-b.get(c,c)/b.get(c,r);
                 for(int i=0;i<size;i++)
                   {
-                    //cdebug("modrows:("<<r<<")=("<<c<<")+("<<r<<")*"<<f);
                     // modify row
                     a.set(i,r,a.get(i,c)+a.get(i,r)*f);
                     b.set(i,r,b.get(i,c)+b.get(i,r)*f);
                   }
-                // cdebug("c:"<<c<<" r:"<<r);
-                // cdebug("INTERMED A:\n"<<a.toString());
-                // cdebug("INTERMED B:\n"<<b.toString());
               }
           }
       }
-    //cdebug("A:\n"<<a.toString());
-    //cdebug("B:\n"<<b.toString());
-
     // upper-right triangle
     for(int c=size-1;c>0;c--) // cols
       {
@@ -74,7 +62,6 @@ bool gauss(TMatrix &a,TMatrix &b,int size)
                 if(f==0)
                   throw GeometryException("Matrix is not invertable - f=0");
 
-                //cdebug("modifyrow:("<<r<<")=("<<r+1<<")+("<<r<<")*"<<f);
                 for(int i=0;i<size;i++)
                   {
                     // modify row
@@ -84,11 +71,7 @@ bool gauss(TMatrix &a,TMatrix &b,int size)
               }
           }
       }
-    //cdebug("A:\n"<<a.toString());
-    //cdebug("B:\n"<<b.toString());
-
     // norming
-
     for(int r=0;r<size;r++)
       {
         float v=b.get(r,r);
@@ -99,8 +82,6 @@ bool gauss(TMatrix &a,TMatrix &b,int size)
               b.set(c,r,b.get(c,r)/v);
             }
       }
-    //cdebug("A:\n"<<a.toString());
-    //cdebug("B:\n"<<b.toString());
     return true; // everythin ok
   }
 
diff --git a/lib/ag_main.h b/lib/ag_main.h
index 4b2e8ed..0c0f878 100644
--- a/lib/ag_main.h
+++ b/lib/ag_main.h
@@ -69,6 +69,7 @@ class AGEXPORT AGMain
   AGVideoBase *getVideo();
   void setVideo(AGVideoBase *p);
 
+  /** get called by AGApplication::run */
   void repeatedCalls();
 
   void delay(int ms);
@@ -92,7 +93,6 @@ AGEXPORT bool hasQuit();
 
 AGEXPORT void setAppName(const std::string &pName);
 AGEXPORT std::string getAppName();
-//std::string AGEXPORT myHash(const std::string &p);
 
 // from ag_debug
 AGEXPORT size_t getDebugLevel();
diff --git a/lib/ag_mutex.h b/lib/ag_mutex.h
index 6dacd66..e8d7ac3 100644
--- a/lib/ag_mutex.h
+++ b/lib/ag_mutex.h
@@ -1,10 +1,17 @@
 #ifndef AG_MUTEX
 #define AG_MUTEX
-
+
 #include <rk_base.h>
 #include <SDL.h>
 #include <SDL_thread.h>
 
+
+
+/**
+ *
+ * Simple Mutex class
+ * FIXME: use C++0x standard mutexes
+ */
 class AGEXPORT AGMutex
 {
  public:
diff --git a/lib/game/ant_game_app.cc b/lib/game/ant_game_app.cc
index db8f98b..e582163 100644
--- a/lib/game/ant_game_app.cc
+++ b/lib/game/ant_game_app.cc
@@ -26,8 +26,6 @@
 
 std::vector<AntActionWidget::Action> getActions ( AntHero *hero,AntEntity *selectedEntity );
 
-void testing();
-
 AntGameApp::AntGameApp ( int w, int h ) : AntBasicGameApp ( w, h )
 {
   // REVIEWED
@@ -36,7 +34,6 @@ AntGameApp::AntGameApp ( int w, int h ) : AntBasicGameApp ( w, h )
   currentHeroId=-1;
   actionWidget=0;
   mPaused=false;
-  testing();
   speed=1;
 }
 
diff --git a/lib/ant_black_fade_widget.cc b/lib/gui/ant_black_fade_widget.cc
similarity index 100%
rename from lib/ant_black_fade_widget.cc
rename to lib/gui/ant_black_fade_widget.cc
diff --git a/lib/ant_black_fade_widget.h b/lib/gui/ant_black_fade_widget.h
similarity index 100%
rename from lib/ant_black_fade_widget.h
rename to lib/gui/ant_black_fade_widget.h
diff --git a/lib/GLee.c b/lib/video/GLee.c
similarity index 100%
rename from lib/GLee.c
rename to lib/video/GLee.c
diff --git a/lib/GLee.h b/lib/video/GLee.h
similarity index 100%
rename from lib/GLee.h
rename to lib/video/GLee.h
diff --git a/lib/ag_clip.cc b/lib/video/ag_clip.cc
similarity index 100%
rename from lib/ag_clip.cc
rename to lib/video/ag_clip.cc
diff --git a/lib/ag_clip.h b/lib/video/ag_clip.h
similarity index 100%
rename from lib/ag_clip.h
rename to lib/video/ag_clip.h
diff --git a/lib/ag_clip_painttarget.cc b/lib/video/ag_clip_painttarget.cc
similarity index 100%
rename from lib/ag_clip_painttarget.cc
rename to lib/video/ag_clip_painttarget.cc
diff --git a/lib/ag_clip_painttarget.h b/lib/video/ag_clip_painttarget.h
similarity index 100%
rename from lib/ag_clip_painttarget.h
rename to lib/video/ag_clip_painttarget.h
diff --git a/lib/ag_color.cc b/lib/video/ag_color.cc
similarity index 100%
rename from lib/ag_color.cc
rename to lib/video/ag_color.cc
diff --git a/lib/ag_color.h b/lib/video/ag_color.h
similarity index 100%
rename from lib/ag_color.h
rename to lib/video/ag_color.h
diff --git a/lib/ag_draw.h b/lib/video/ag_draw.h
similarity index 100%
rename from lib/ag_draw.h
rename to lib/video/ag_draw.h
diff --git a/lib/ag_fbo.cc b/lib/video/ag_fbo.cc
similarity index 100%
rename from lib/ag_fbo.cc
rename to lib/video/ag_fbo.cc
diff --git a/lib/ag_fbo.h b/lib/video/ag_fbo.h
similarity index 100%
rename from lib/ag_fbo.h
rename to lib/video/ag_fbo.h
diff --git a/lib/ag_font.cc b/lib/video/ag_font.cc
similarity index 100%
rename from lib/ag_font.cc
rename to lib/video/ag_font.cc
diff --git a/lib/ag_font.h b/lib/video/ag_font.h
similarity index 100%
rename from lib/ag_font.h
rename to lib/video/ag_font.h
diff --git a/lib/ag_fontengine.cc b/lib/video/ag_fontengine.cc
similarity index 100%
rename from lib/ag_fontengine.cc
rename to lib/video/ag_fontengine.cc
diff --git a/lib/ag_fontengine.h b/lib/video/ag_fontengine.h
similarity index 100%
rename from lib/ag_fontengine.h
rename to lib/video/ag_fontengine.h
diff --git a/lib/ag_glpainter.cc b/lib/video/ag_glpainter.cc
similarity index 100%
rename from lib/ag_glpainter.cc
rename to lib/video/ag_glpainter.cc
diff --git a/lib/ag_glpainter.h b/lib/video/ag_glpainter.h
similarity index 100%
rename from lib/ag_glpainter.h
rename to lib/video/ag_glpainter.h
diff --git a/lib/ag_glscreen.cc b/lib/video/ag_glscreen.cc
similarity index 100%
rename from lib/ag_glscreen.cc
rename to lib/video/ag_glscreen.cc
diff --git a/lib/ag_glscreen.h b/lib/video/ag_glscreen.h
similarity index 100%
rename from lib/ag_glscreen.h
rename to lib/video/ag_glscreen.h
diff --git a/lib/ag_gltexture.cc b/lib/video/ag_gltexture.cc
similarity index 100%
rename from lib/ag_gltexture.cc
rename to lib/video/ag_gltexture.cc
diff --git a/lib/ag_gltexture.h b/lib/video/ag_gltexture.h
similarity index 100%
rename from lib/ag_gltexture.h
rename to lib/video/ag_gltexture.h
diff --git a/lib/ag_gradient.cc b/lib/video/ag_gradient.cc
similarity index 100%
rename from lib/ag_gradient.cc
rename to lib/video/ag_gradient.cc
diff --git a/lib/ag_painter.cc b/lib/video/ag_painter.cc
similarity index 100%
rename from lib/ag_painter.cc
rename to lib/video/ag_painter.cc
diff --git a/lib/ag_painter.h b/lib/video/ag_painter.h
similarity index 100%
rename from lib/ag_painter.h
rename to lib/video/ag_painter.h
diff --git a/lib/ag_painttarget.h b/lib/video/ag_painttarget.h
similarity index 100%
rename from lib/ag_painttarget.h
rename to lib/video/ag_painttarget.h
diff --git a/lib/ag_png.cc b/lib/video/ag_png.cc
similarity index 100%
rename from lib/ag_png.cc
rename to lib/video/ag_png.cc
diff --git a/lib/ag_png.h b/lib/video/ag_png.h
similarity index 100%
rename from lib/ag_png.h
rename to lib/video/ag_png.h
diff --git a/lib/ag_projection.cc b/lib/video/ag_projection.cc
similarity index 100%
rename from lib/ag_projection.cc
rename to lib/video/ag_projection.cc
diff --git a/lib/ag_projection.h b/lib/video/ag_projection.h
similarity index 100%
rename from lib/ag_projection.h
rename to lib/video/ag_projection.h
diff --git a/lib/ag_rendercontext.cc b/lib/video/ag_rendercontext.cc
similarity index 100%
rename from lib/ag_rendercontext.cc
rename to lib/video/ag_rendercontext.cc
diff --git a/lib/ag_rendercontext.h b/lib/video/ag_rendercontext.h
similarity index 100%
rename from lib/ag_rendercontext.h
rename to lib/video/ag_rendercontext.h
diff --git a/lib/ag_screen.cc b/lib/video/ag_screen.cc
similarity index 100%
rename from lib/ag_screen.cc
rename to lib/video/ag_screen.cc
diff --git a/lib/ag_screen.h b/lib/video/ag_screen.h
similarity index 100%
rename from lib/ag_screen.h
rename to lib/video/ag_screen.h
diff --git a/lib/ag_sdlpainter.cc b/lib/video/ag_sdlpainter.cc
similarity index 100%
rename from lib/ag_sdlpainter.cc
rename to lib/video/ag_sdlpainter.cc
diff --git a/lib/ag_sdlpainter.h b/lib/video/ag_sdlpainter.h
similarity index 100%
rename from lib/ag_sdlpainter.h
rename to lib/video/ag_sdlpainter.h
diff --git a/lib/ag_sdlscreen.cc b/lib/video/ag_sdlscreen.cc
similarity index 100%
rename from lib/ag_sdlscreen.cc
rename to lib/video/ag_sdlscreen.cc
diff --git a/lib/ag_sdlscreen.h b/lib/video/ag_sdlscreen.h
similarity index 100%
rename from lib/ag_sdlscreen.h
rename to lib/video/ag_sdlscreen.h
diff --git a/lib/ag_sdlsurface.h b/lib/video/ag_sdlsurface.h
similarity index 100%
rename from lib/ag_sdlsurface.h
rename to lib/video/ag_sdlsurface.h
diff --git a/lib/ag_sgeexport.h b/lib/video/ag_sgeexport.h
similarity index 100%
rename from lib/ag_sgeexport.h
rename to lib/video/ag_sgeexport.h
diff --git a/lib/ag_surface.cc b/lib/video/ag_surface.cc
similarity index 100%
rename from lib/ag_surface.cc
rename to lib/video/ag_surface.cc
diff --git a/lib/ag_surface.h b/lib/video/ag_surface.h
similarity index 100%
rename from lib/ag_surface.h
rename to lib/video/ag_surface.h
diff --git a/lib/ag_surface_internal.cc b/lib/video/ag_surface_internal.cc
similarity index 100%
rename from lib/ag_surface_internal.cc
rename to lib/video/ag_surface_internal.cc
diff --git a/lib/ag_surface_internal.h b/lib/video/ag_surface_internal.h
similarity index 100%
rename from lib/ag_surface_internal.h
rename to lib/video/ag_surface_internal.h
diff --git a/lib/ag_surfacemanager.cc b/lib/video/ag_surfacemanager.cc
similarity index 100%
rename from lib/ag_surfacemanager.cc
rename to lib/video/ag_surfacemanager.cc
diff --git a/lib/ag_surfacemanager.h b/lib/video/ag_surfacemanager.h
similarity index 100%
rename from lib/ag_surfacemanager.h
rename to lib/video/ag_surfacemanager.h
diff --git a/lib/ag_texture.cc b/lib/video/ag_texture.cc
similarity index 100%
rename from lib/ag_texture.cc
rename to lib/video/ag_texture.cc
diff --git a/lib/ag_texture.h b/lib/video/ag_texture.h
similarity index 100%
rename from lib/ag_texture.h
rename to lib/video/ag_texture.h
diff --git a/lib/ag_texturecache.cc b/lib/video/ag_texturecache.cc
similarity index 100%
rename from lib/ag_texturecache.cc
rename to lib/video/ag_texturecache.cc
diff --git a/lib/ag_texturecache.h b/lib/video/ag_texturecache.h
similarity index 100%
rename from lib/ag_texturecache.h
rename to lib/video/ag_texturecache.h
diff --git a/lib/ag_video.cc b/lib/video/ag_video.cc
similarity index 100%
rename from lib/ag_video.cc
rename to lib/video/ag_video.cc
diff --git a/lib/ag_video.h b/lib/video/ag_video.h
similarity index 100%
rename from lib/ag_video.h
rename to lib/video/ag_video.h
diff --git a/lib/ag_video_base.cc b/lib/video/ag_video_base.cc
similarity index 100%
rename from lib/ag_video_base.cc
rename to lib/video/ag_video_base.cc
diff --git a/lib/ag_video_base.h b/lib/video/ag_video_base.h
similarity index 100%
rename from lib/ag_video_base.h
rename to lib/video/ag_video_base.h
diff --git a/lib/ant_frustum.cc b/lib/video/ant_frustum.cc
similarity index 100%
rename from lib/ant_frustum.cc
rename to lib/video/ant_frustum.cc
diff --git a/lib/ant_frustum.h b/lib/video/ant_frustum.h
similarity index 100%
rename from lib/ant_frustum.h
rename to lib/video/ant_frustum.h
diff --git a/lib/sge_config.h b/lib/video/sge_config.h
similarity index 100%
rename from lib/sge_config.h
rename to lib/video/sge_config.h
diff --git a/lib/sge_internal.h b/lib/video/sge_internal.h
similarity index 100%
rename from lib/sge_internal.h
rename to lib/video/sge_internal.h
diff --git a/lib/sge_primitives.cc b/lib/video/sge_primitives.cc
similarity index 100%
rename from lib/sge_primitives.cc
rename to lib/video/sge_primitives.cc
diff --git a/lib/sge_primitives.h b/lib/video/sge_primitives.h
similarity index 100%
rename from lib/sge_primitives.h
rename to lib/video/sge_primitives.h
diff --git a/lib/sge_surface.cc b/lib/video/sge_surface.cc
similarity index 100%
rename from lib/sge_surface.cc
rename to lib/video/sge_surface.cc
diff --git a/lib/sge_surface.h b/lib/video/sge_surface.h
similarity index 100%
rename from lib/sge_surface.h
rename to lib/video/sge_surface.h