Changeset 9423 in orxonox.OLD

Timestamp:

Jul 24, 2006, 2:27:39 PM (18 years ago)

Author:

ponder

Message:

 

Location:

branches/terrain/src

Files:

• lib/graphics/importer/terrain/terrain.cc (modified) (1 diff)
• lib/util/threading.h (modified) (1 diff)
• util/signal_handler.cc (modified) (1 diff)
• util/signal_handler.h (modified) (2 diffs)

branches/terrain/src/lib/graphics/importer/terrain/terrain.cc

@@ -53 +53 @@
   heightfield.pitch = tmpData->pitch;
   int dataSize = heightfield.pitch*heightfield.height;
+        
   heightfield.data = new Uint8[dataSize];
   memcpy( heightfield.data, tmpData->pixels, sizeof(Uint8)*dataSize );
+        for ( int x = 0; x < heightfield.width; ++x ) {
+                for ( int y = 0; y < heightfield.height; ++y ) {
+                        printf( "height of %d, %d is %f\n", x, y, getAltitude( x, y ) );
+                }
+        }
   SDL_FreeSurface( tmpData );
   pagesX = (heightfield.width/(pageSize-1) );

branches/terrain/src/lib/util/threading.h

@@ -8 +8 @@
 #ifndef _THREADING_H
 #define _THREADING_H
-
+#include <string>
 #ifdef HAVE_SDL_H
  #include <SDL_thread.h>

branches/terrain/src/util/signal_handler.cc

@@ -19 +19 @@
 SignalHandler * SignalHandler::singletonRef = NULL;
 
-#ifndef __WIN32__
+#ifdef __LINUX__
 
 #include <wait.h>

branches/terrain/src/util/signal_handler.h

@@ -12 +12 @@
 typedef int (*SignalCallback)( void * someData );
 
-#ifndef __WIN32__
+#ifdef __LINUX__
 #include <signal.h>
 
@@ -63 +63 @@
  public:
    inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
-  void doCatch( std::string appName ) {};
-  void dontCatch() {};
+        void doCatch( const std::string & appName, const std::string & fileName ) {}
+        void dontCatch() {}
   void registerCallback( SignalCallback cb, void * someData ) {};