Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9423 in orxonox.OLD for branches/terrain


Ignore:
Timestamp:
Jul 24, 2006, 2:27:39 PM (18 years ago)
Author:
ponder
Message:
 
Location:
branches/terrain/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/terrain/src/lib/graphics/importer/terrain/terrain.cc

    r9421 r9423  
    5353  heightfield.pitch = tmpData->pitch;
    5454  int dataSize = heightfield.pitch*heightfield.height;
     55       
    5556  heightfield.data = new Uint8[dataSize];
    5657  memcpy( heightfield.data, tmpData->pixels, sizeof(Uint8)*dataSize );
     58        for ( int x = 0; x < heightfield.width; ++x ) {
     59                for ( int y = 0; y < heightfield.height; ++y ) {
     60                        printf( "height of %d, %d is %f\n", x, y, getAltitude( x, y ) );
     61                }
     62        }
    5763  SDL_FreeSurface( tmpData );
    5864  pagesX = (heightfield.width/(pageSize-1) );
  • branches/terrain/src/lib/util/threading.h

    r7847 r9423  
    88#ifndef _THREADING_H
    99#define _THREADING_H
    10 
     10#include <string>
    1111#ifdef HAVE_SDL_H
    1212 #include <SDL_thread.h>
  • branches/terrain/src/util/signal_handler.cc

    r9406 r9423  
    1919SignalHandler * SignalHandler::singletonRef = NULL;
    2020
    21 #ifndef __WIN32__
     21#ifdef __LINUX__
    2222
    2323#include <wait.h>
  • branches/terrain/src/util/signal_handler.h

    r9406 r9423  
    1212typedef int (*SignalCallback)( void * someData );
    1313
    14 #ifndef __WIN32__
     14#ifdef __LINUX__
    1515#include <signal.h>
    1616
     
    6363 public:
    6464   inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
    65   void doCatch( std::string appName ) {};
    66   void dontCatch() {};
     65        void doCatch( const std::string & appName, const std::string & fileName ) {}
     66        void dontCatch() {}
    6767  void registerCallback( SignalCallback cb, void * someData ) {};
    6868
Note: See TracChangeset for help on using the changeset viewer.