Menu
▾
▴
simspark-cvs — CVS Commit Notifications via Email
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(153) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(46) |
Mar
(12) |
Apr
(4) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(263) |
Mar
(235) |
Apr
(66) |
May
(42) |
Jun
(270) |
Jul
(65) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Markus R. <rol...@us...> - 2007-03-06 21:35:59
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18195 Modified Files: Tag: WIN32 mainframe.cpp rsgedit.wxg Log Message: - remove wxTE_LINEWRAP attribute (this flag is only available in the latest CVS version of wxWidgets) Index: rsgedit.wxg =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.wxg,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -C2 -d -r1.4.2.5 -r1.4.2.6 *** rsgedit.wxg 23 Feb 2007 22:25:48 -0000 1.4.2.5 --- rsgedit.wxg 6 Mar 2007 21:35:52 -0000 1.4.2.6 *************** *** 1,4 **** <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Fri Feb 23 23:25:00 2007 --> <application path="." name="" class="" option="1" language="C++" top_window="MainFrame" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6"> --- 1,4 ---- <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Tue Mar 06 22:13:36 2007 --> <application path="." name="" class="" option="1" language="C++" top_window="MainFrame" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6"> *************** *** 164,168 **** <option>1</option> <object class="wxTextCtrl" name="mCtrLog" base="EditTextCtrl"> ! <style>wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL|wxTE_LINEWRAP</style> </object> </object> --- 164,168 ---- <option>1</option> <object class="wxTextCtrl" name="mCtrLog" base="EditTextCtrl"> ! <style>wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL</style> </object> </object> Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.8.2.10 retrieving revision 1.8.2.11 diff -C2 -d -r1.8.2.10 -r1.8.2.11 *** mainframe.cpp 28 Feb 2007 00:19:30 -0000 1.8.2.10 --- mainframe.cpp 6 Mar 2007 21:35:52 -0000 1.8.2.11 *************** *** 124,128 **** mCtrTree = new wxTreeCtrl(window_1_pane_2, 1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER); mCanvas = new SparkGLCanvas(mTopPane, -1); ! mCtrLog = new wxTextCtrl(mBottomPane, -1, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL|wxTE_LINEWRAP); set_properties(); --- 124,128 ---- mCtrTree = new wxTreeCtrl(window_1_pane_2, 1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER); mCanvas = new SparkGLCanvas(mTopPane, -1); ! mCtrLog = new wxTextCtrl(mBottomPane, -1, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL); set_properties(); |
|
From: Oliver O. <fr...@us...> - 2007-03-06 06:13:47
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20777 Modified Files: Tag: WIN32 ChangeLog Log Message: *** empty log message *** Index: ChangeLog =================================================================== RCS file: /cvsroot/simspark/simspark/spark/ChangeLog,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ChangeLog 13 Feb 2007 00:06:33 -0000 1.1.2.1 --- ChangeLog 6 Mar 2007 06:13:44 -0000 1.1.2.2 *************** *** 1,2 **** --- 1,56 ---- + 2007-03-06 Oliver Obst <fr...@us...> + + * zeitgeist/core.cpp: + - fixed Core::BindClass to attach a core to ClassClass + + 2007-02-28 Oliver Obst <fr...@us...> + + * configure.ac: - added test directory + * kerosin/Makefile.am: + - added openglwrapper.h and openglsystem.h to Makefile + * plugin/openglsyssdl/openglsystemsdl.cpp: + - replaced GL.h inclusion by our openglwrapper + * plugin/rosimporter/rosimporter.cpp: + - removed the GL/glu.h include + * utility/sfsexp/Makefile.am: + - removed EXTRA_DIST for README + * plugin/rosimporter/Makefile.am: + - added roselements.h to Makefile + * plugin/openglsyssdl/Makefile.am: + - added openglsystemsdl.h file to Makefile + * Makefile.am: + - added test and plugin subdir + * oxygen/Makefile.am: + - added jointeffector.h and jointperceptor.h to Makefile + - added transformcollider.h to Makefile + * utility/rcssnet/Makefile.am: + - added handler.cpp to the Makefile + * utility/tinyxml/Makefile.am: + - added header files, so they go into the distribution as well + * acinclude.m4: + - fixed all graphic related checks to work with Mac OS X + + * kerosin/fontserver/font.cpp: + * kerosin/fontserver/font.h: + - moved including OpenGL stuff from font.cpp to font.h + - changed handle from uint to GLuint + + * kerosin/openglserver/openglwrapper.h: + - added apple MacOS specific stuff + * kerosin/textureserver/texture.cpp: + * kerosin/textureserver/texture.h: + - moved inclusion of openglwrapper from .cpp to .h + - changed the texture handle from uint to GLuint + + 2007-02-28 Oliver Obst <fr...@us...> + + * oxygen/Makefile.am: added odewrapper.h + + + 2007-02-27 Oliver Obst <fr...@us...> + + * zeitgeist/scriptserver/scriptserver.cpp: + - included config.h to get the PACKAGE_NAME + 2007-02-13 Oliver Obst <fr...@us...> |
|
From: Oliver O. <fr...@us...> - 2007-03-06 06:13:19
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20762 Modified Files: Tag: WIN32 README Log Message: Index: README =================================================================== RCS file: /cvsroot/simspark/simspark/spark/README,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** README 19 Dec 2005 20:09:16 -0000 1.1 --- README 6 Mar 2007 06:13:15 -0000 1.1.2.1 *************** *** 0 **** --- 1 ---- + Simspark README |
|
From: Oliver O. <fr...@us...> - 2007-03-06 06:04:26
|
Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17306 Modified Files: Tag: WIN32 monitorcontrol.cpp Log Message: fixed check for the monitorserver Index: monitorcontrol.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/monitorcontrol.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** monitorcontrol.cpp 23 Feb 2007 19:27:18 -0000 1.1.2.2 --- monitorcontrol.cpp 6 Mar 2007 06:04:22 -0000 1.1.2.3 *************** *** 45,49 **** RegisterCachedPath(mMonitorServer, "/sys/server/monitor"); ! if (mMonitorServer.expired() == 0) { GetLog()->Error() --- 45,49 ---- RegisterCachedPath(mMonitorServer, "/sys/server/monitor"); ! if (mMonitorServer.expired()) { GetLog()->Error() |
|
From: Oliver O. <fr...@us...> - 2007-03-06 06:02:19
|
Update of /cvsroot/simspark/simspark/spark/salt In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16526 Modified Files: Tag: WIN32 sharedlibrary.cpp Log Message: fixed typo Index: sharedlibrary.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/salt/sharedlibrary.cpp,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** sharedlibrary.cpp 10 Feb 2007 18:59:14 -0000 1.3.2.2 --- sharedlibrary.cpp 6 Mar 2007 06:02:08 -0000 1.3.2.3 *************** *** 82,86 **** if (mLibHandle == NULL) { ! std::cerr << "(SharedLibrary) ERROR: dlopen faild for " << libName << " with: \n\t" << dlerror() << std::endl; } --- 82,86 ---- if (mLibHandle == NULL) { ! std::cerr << "(SharedLibrary) ERROR: dlopen failed for " << libName << " with: \n\t" << dlerror() << std::endl; } |
|
From: Oliver O. <fr...@us...> - 2007-03-06 05:57:37
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14904 Modified Files: Tag: WIN32 core.cpp Log Message: - fixed Core::BindClass to attach a core to ClassClass Index: core.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.cpp,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** core.cpp 18 Feb 2007 12:01:55 -0000 1.2.2.4 --- core.cpp 6 Mar 2007 05:57:28 -0000 1.2.2.5 *************** *** 478,486 **** void Core::BindClass(const boost::shared_ptr<Class> &newClass) const { ! if (newClass != mClassClass) ! { ! newClass->Construct(newClass, mClassClass); ! newClass->AttachTo(mSelf); ! } } --- 478,490 ---- void Core::BindClass(const boost::shared_ptr<Class> &newClass) const { ! /* The following condition (true || ...) is always true. ! * The condition right of the || was the original condition, but I had to ! * change it since this caused ClassClass to have no core attached on my system ! * (which in turn made the program crash) -- oliver */ ! if (true || newClass != mClassClass) ! { ! newClass->Construct(newClass, mClassClass); ! newClass->AttachTo(mSelf); ! } } |
|
From: Markus R. <rol...@us...> - 2007-02-28 20:51:42
|
Update of /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9516 Modified Files: Tag: WIN32 gamecontrolserver.cpp gamecontrolserver.h Log Message: sync with rcssserver3d: implemented method GetAgentCount which returns the number of agents currently connected to the server Index: gamecontrolserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/gamecontrolserver.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** gamecontrolserver.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 --- gamecontrolserver.cpp 28 Feb 2007 20:38:38 -0000 1.1.2.2 *************** *** 225,228 **** --- 225,234 ---- } + int + GameControlServer::GetAgentCount() const + { + return mAgentMap.size(); + } + shared_ptr<ActionObject::TList> GameControlServer::Parse(int id, const string& str) const Index: gamecontrolserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/gamecontrolserver.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** gamecontrolserver.h 5 Dec 2005 21:16:49 -0000 1.1 --- gamecontrolserver.h 28 Feb 2007 20:38:38 -0000 1.1.2.1 *************** *** 101,104 **** --- 101,109 ---- float GetActionLatency(int id); + /** returns the number of agents currently connected + to the simulator + */ + int GetAgentCount() const; + /** returns the AgentAspect for the given \param id */ boost::shared_ptr<AgentAspect> GetAgentAspect(int id); |
|
From: Markus R. <rol...@us...> - 2007-02-28 20:51:42
|
Update of /cvsroot/simspark/simspark/spark/plugin/sparkmonitor In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9941 Modified Files: Tag: WIN32 sparkmonitorclient.cpp Log Message: - sync with rcssserver3d cvs: check if mNetMessage pointer is non-zero before trying to extract message Index: sparkmonitorclient.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkmonitor/sparkmonitorclient.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** sparkmonitorclient.cpp 13 Dec 2005 21:48:50 -0000 1.1 --- sparkmonitorclient.cpp 28 Feb 2007 20:39:28 -0000 1.1.2.1 *************** *** 99,106 **** string msg; ! while (mNetMessage->Extract(mNetBuffer, msg)) { ParseMessage(msg); } } --- 99,110 ---- string msg; ! ! if (mNetMessage.get() != 0) ! { ! while (mNetMessage->Extract(mNetBuffer, msg)) { ParseMessage(msg); } + } } |
|
From: Markus R. <rol...@us...> - 2007-02-28 20:51:42
|
Update of /cvsroot/simspark/simspark/spark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9555 Modified Files: Tag: WIN32 spark.rb Log Message: - sync with rcssserver3d cvs: fixed typo in parameter name for sparkLogAllToFile function Index: spark.rb =================================================================== RCS file: /cvsroot/simspark/simspark/spark/spark/spark.rb,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -d -r1.5.2.3 -r1.5.2.4 *** spark.rb 25 Feb 2007 16:28:21 -0000 1.5.2.3 --- spark.rb 28 Feb 2007 20:39:01 -0000 1.5.2.4 *************** *** 311,315 **** # logs all output to 'fileName' ! def sparkLogAllToFile(filenName) sparkEnableLog(fileName, 'eAll') end --- 311,315 ---- # logs all output to 'fileName' ! def sparkLogAllToFile(fileName) sparkEnableLog(fileName, 'eAll') end |
|
From: Oliver O. <fr...@us...> - 2007-02-28 09:16:55
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25621 Modified Files: Tag: WIN32 Makefile.am Log Message: - added content in the win32 subdir to the distribution Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Makefile.am 28 Feb 2007 08:04:09 -0000 1.1.2.1 --- Makefile.am 28 Feb 2007 09:16:51 -0000 1.1.2.2 *************** *** 7,11 **** CLEANFILES = DISTCLEANFILES = $(top_srcdir)/macosX/SDLMain.o $(top_srcdir)/macosX/libSDLmain.a ! EXTRA_DIST = macosX/SDLMain.h macosX/SDLMain.m EXTRA_SRC_DISTS = --- 7,12 ---- CLEANFILES = DISTCLEANFILES = $(top_srcdir)/macosX/SDLMain.o $(top_srcdir)/macosX/libSDLmain.a ! EXTRA_DIST = macosX/SDLMain.h macosX/SDLMain.m \ ! win32/config.h win32/simspark.iss win32/spark.ico EXTRA_SRC_DISTS = |
|
From: Oliver O. <fr...@us...> - 2007-02-28 09:07:52
|
Update of /cvsroot/simspark/simspark/spark/macosX In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22749 Added Files: Tag: WIN32 .cvsignore SDLMain.h SDLMain.m Log Message: --- NEW FILE: .cvsignore --- libSDLmain.a SDLMain.o --- NEW FILE: SDLMain.m --- /* SDLMain.m - main entry point for our Cocoa-ized SDL app Initial Version: Darrell Walisser <dwa...@pu...> Non-NIB-Code & other changes: Max Horn <ma...@qu...> Feel free to customize this file to suit your needs */ #import "SDL.h" #import "SDLMain.h" #import <sys/param.h> /* for MAXPATHLEN */ #import <unistd.h> /* For some reaon, Apple removed setAppleMenu from the headers in 10.4, but the method still is there and works. To avoid warnings, we declare it ourselves here. */ @interface NSApplication(SDL_Missing_Methods) - (void)setAppleMenu:(NSMenu *)menu; @end /* Use this flag to determine whether we use SDLMain.nib or not */ #define SDL_USE_NIB_FILE 0 /* Use this flag to determine whether we use CPS (docking) or not */ #define SDL_USE_CPS 1 #ifdef SDL_USE_CPS /* Portions of CPS.h */ typedef struct CPSProcessSerNum { UInt32 lo; UInt32 hi; } CPSProcessSerNum; extern OSErr CPSGetCurrentProcess( CPSProcessSerNum *psn); extern OSErr CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5); extern OSErr CPSSetFrontProcess( CPSProcessSerNum *psn); #endif /* SDL_USE_CPS */ static int gArgc; static char **gArgv; static BOOL gFinderLaunch; static BOOL gCalledAppMainline = FALSE; static NSString *getApplicationName(void) { NSDictionary *dict; NSString *appName = 0; /* Determine the application name */ dict = (NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle()); if (dict) appName = [dict objectForKey: @"CFBundleName"]; if (![appName length]) appName = [[NSProcessInfo processInfo] processName]; return appName; } #if SDL_USE_NIB_FILE /* A helper category for NSString */ @interface NSString (ReplaceSubString) - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString; @end #endif @interface SDLApplication : NSApplication @end @implementation SDLApplication /* Invoked from the Quit menu item */ - (void)terminate:(id)sender { /* Post a SDL_QUIT event */ SDL_Event event; event.type = SDL_QUIT; SDL_PushEvent(&event); } @end /* The main class of the application, the application's delegate */ @implementation SDLMain /* Set the working directory to the .app's parent directory */ - (void) setupWorkingDirectory:(BOOL)shouldChdir { if (shouldChdir) { char parentdir[MAXPATHLEN]; CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle()); CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url); if (CFURLGetFileSystemRepresentation(url2, true, (UInt8 *)parentdir, MAXPATHLEN)) { assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */ } CFRelease(url); CFRelease(url2); } } #if SDL_USE_NIB_FILE /* Fix menu to contain the real app name instead of "SDL App" */ - (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName { NSRange aRange; NSEnumerator *enumerator; NSMenuItem *menuItem; aRange = [[aMenu title] rangeOfString:@"SDL App"]; if (aRange.length != 0) [aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]]; enumerator = [[aMenu itemArray] objectEnumerator]; while ((menuItem = [enumerator nextObject])) { aRange = [[menuItem title] rangeOfString:@"SDL App"]; if (aRange.length != 0) [menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]]; if ([menuItem hasSubmenu]) [self fixMenu:[menuItem submenu] withAppName:appName]; } [ aMenu sizeToFit ]; } #else static void setApplicationMenu(void) { /* warning: this code is very odd */ NSMenu *appleMenu; NSMenuItem *menuItem; NSString *title; NSString *appName; appName = getApplicationName(); appleMenu = [[NSMenu alloc] initWithTitle:@""]; /* Add menu items */ title = [@"About " stringByAppendingString:appName]; [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""]; [appleMenu addItem:[NSMenuItem separatorItem]]; title = [@"Hide " stringByAppendingString:appName]; [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"]; menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)]; [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""]; [appleMenu addItem:[NSMenuItem separatorItem]]; title = [@"Quit " stringByAppendingString:appName]; [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; /* Put menu into the menubar */ menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]; [menuItem setSubmenu:appleMenu]; [[NSApp mainMenu] addItem:menuItem]; /* Tell the application object that this is now the application menu */ [NSApp setAppleMenu:appleMenu]; /* Finally give up our references to the objects */ [appleMenu release]; [menuItem release]; } /* Create a window menu */ static void setupWindowMenu(void) { NSMenu *windowMenu; NSMenuItem *windowMenuItem; NSMenuItem *menuItem; windowMenu = [[NSMenu alloc] initWithTitle:@"Window"]; /* "Minimize" item */ menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [windowMenu addItem:menuItem]; [menuItem release]; /* Put menu into the menubar */ windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; [windowMenuItem setSubmenu:windowMenu]; [[NSApp mainMenu] addItem:windowMenuItem]; /* Tell the application object that this is now the window menu */ [NSApp setWindowsMenu:windowMenu]; /* Finally give up our references to the objects */ [windowMenu release]; [windowMenuItem release]; } /* Replacement for NSApplicationMain */ static void CustomApplicationMain (int argc, char **argv) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; SDLMain *sdlMain; /* Ensure the application object is initialised */ [SDLApplication sharedApplication]; #ifdef SDL_USE_CPS { CPSProcessSerNum PSN; /* Tell the dock about us */ if (!CPSGetCurrentProcess(&PSN)) if (!CPSEnableForegroundOperation(&PSN,0x03,0x3C,0x2C,0x1103)) if (!CPSSetFrontProcess(&PSN)) [SDLApplication sharedApplication]; } #endif /* SDL_USE_CPS */ /* Set up the menubar */ [NSApp setMainMenu:[[NSMenu alloc] init]]; setApplicationMenu(); setupWindowMenu(); /* Create SDLMain and make it the app delegate */ sdlMain = [[SDLMain alloc] init]; [NSApp setDelegate:sdlMain]; /* Start the main event loop */ [NSApp run]; [sdlMain release]; [pool release]; } #endif /* * Catch document open requests...this lets us notice files when the app * was launched by double-clicking a document, or when a document was * dragged/dropped on the app's icon. You need to have a * CFBundleDocumentsType section in your Info.plist to get this message, * apparently. * * Files are added to gArgv, so to the app, they'll look like command line * arguments. Previously, apps launched from the finder had nothing but * an argv[0]. * * This message may be received multiple times to open several docs on launch. * * This message is ignored once the app's mainline has been called. */ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename { const char *temparg; size_t arglen; char *arg; char **newargv; if (!gFinderLaunch) /* MacOS is passing command line args. */ return FALSE; if (gCalledAppMainline) /* app has started, ignore this document. */ return FALSE; temparg = [filename UTF8String]; arglen = SDL_strlen(temparg) + 1; arg = (char *) SDL_malloc(arglen); if (arg == NULL) return FALSE; newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2)); if (newargv == NULL) { SDL_free(arg); return FALSE; } gArgv = newargv; SDL_strlcpy(arg, temparg, arglen); gArgv[gArgc++] = arg; gArgv[gArgc] = NULL; return TRUE; } /* Called when the internal event loop has just started running */ - (void) applicationDidFinishLaunching: (NSNotification *) note { int status; /* Set the working directory to the .app's parent directory */ [self setupWorkingDirectory:gFinderLaunch]; #if SDL_USE_NIB_FILE /* Set the main menu to contain the real app name instead of "SDL App" */ [self fixMenu:[NSApp mainMenu] withAppName:getApplicationName()]; #endif /* Hand off to main application code */ gCalledAppMainline = TRUE; status = SDL_main (gArgc, gArgv); /* We're done, thank you for playing */ exit(status); } @end @implementation NSString (ReplaceSubString) - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString { unsigned int bufferSize; unsigned int selfLen = [self length]; unsigned int aStringLen = [aString length]; unichar *buffer; NSRange localRange; NSString *result; bufferSize = selfLen + aStringLen - aRange.length; buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar)); /* Get first part into buffer */ localRange.location = 0; localRange.length = aRange.location; [self getCharacters:buffer range:localRange]; /* Get middle part into buffer */ localRange.location = 0; localRange.length = aStringLen; [aString getCharacters:(buffer+aRange.location) range:localRange]; /* Get last part into buffer */ localRange.location = aRange.location + aRange.length; localRange.length = selfLen - localRange.location; [self getCharacters:(buffer+aRange.location+aStringLen) range:localRange]; /* Build output string */ result = [NSString stringWithCharacters:buffer length:bufferSize]; NSDeallocateMemoryPages(buffer, bufferSize); return result; } @end #ifdef main # undef main #endif /* Main entry point to executable - should *not* be SDL_main! */ int main (int argc, char **argv) { /* Copy the arguments into a global variable */ /* This is passed if we are launched by double-clicking */ if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) { gArgv = (char **) SDL_malloc(sizeof (char *) * 2); gArgv[0] = argv[0]; gArgv[1] = NULL; gArgc = 1; gFinderLaunch = YES; } else { int i; gArgc = argc; gArgv = (char **) SDL_malloc(sizeof (char *) * (argc+1)); for (i = 0; i <= argc; i++) gArgv[i] = argv[i]; gFinderLaunch = NO; } #if SDL_USE_NIB_FILE [SDLApplication poseAsClass:[NSApplication class]]; NSApplicationMain (argc, argv); #else CustomApplicationMain (argc, argv); #endif return 0; } --- NEW FILE: SDLMain.h --- /* SDLMain.m - main entry point for our Cocoa-ized SDL app Initial Version: Darrell Walisser <dwa...@pu...> Non-NIB-Code & other changes: Max Horn <ma...@qu...> Feel free to customize this file to suit your needs */ #import <Cocoa/Cocoa.h> @interface SDLMain : NSObject @end |
|
From: Oliver O. <fr...@us...> - 2007-02-28 09:05:15
|
Update of /cvsroot/simspark/simspark/spark/macosX In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21875/macosX Log Message: Directory /cvsroot/simspark/simspark/spark/macosX added to the repository --> Using per-directory sticky tag `WIN32' |
|
From: Oliver O. <fr...@us...> - 2007-02-28 09:00:42
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20211 Modified Files: Tag: WIN32 configure.ac Log Message: - added test directory Index: configure.ac =================================================================== RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** configure.ac 13 Feb 2007 00:03:41 -0000 1.5.2.1 --- configure.ac 28 Feb 2007 09:00:33 -0000 1.5.2.2 *************** *** 143,146 **** --- 143,148 ---- spark/Makefile \ spark/spark-config \ + test/Makefile \ + test/coretest/Makefile \ plugin/Makefile \ plugin/filesystemstd/Makefile \ *************** *** 152,157 **** plugin/rosimporter/Makefile \ plugin/sparkmonitor/Makefile \ ! plugin/sparkagent/Makefile \ ! test/coretest/Makefile ], [test -f salt/salt-config && chmod a+x salt/salt-config && \ test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \ --- 154,158 ---- plugin/rosimporter/Makefile \ plugin/sparkmonitor/Makefile \ ! plugin/sparkagent/Makefile ], [test -f salt/salt-config && chmod a+x salt/salt-config && \ test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \ |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:16:34
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4043 Modified Files: Tag: WIN32 Makefile.am Log Message: - added openglwrapper.h and openglsystem.h to Makefile Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/Makefile.am,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** Makefile.am 28 Feb 2007 04:44:07 -0000 1.6.2.1 --- Makefile.am 28 Feb 2007 08:16:23 -0000 1.6.2.2 *************** *** 144,147 **** --- 144,149 ---- textureserver/texture2d.h \ textureserver/textureserver.h \ + openglserver/openglwrapper.h \ + openglserver/openglsystem.h \ openglserver/openglserver.h \ openglserver/glbase.h \ |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:14:24
|
Update of /cvsroot/simspark/simspark/spark/plugin/openglsyssdl In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3202 Modified Files: Tag: WIN32 openglsystemsdl.cpp Log Message: - replaced GL.h inclusion by our openglwrapper Index: openglsystemsdl.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/openglsyssdl/openglsystemsdl.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** openglsystemsdl.cpp 13 Dec 2005 21:48:48 -0000 1.1 --- openglsystemsdl.cpp 28 Feb 2007 08:14:17 -0000 1.1.2.1 *************** *** 24,28 **** #include <zeitgeist/logserver/logserver.h> #include <zeitgeist/scriptserver/scriptserver.h> ! #include <GL/gl.h> #include <SDL/SDL.h> --- 24,28 ---- #include <zeitgeist/logserver/logserver.h> #include <zeitgeist/scriptserver/scriptserver.h> ! #include <kerosin/openglserver/openglwrapper.h> #include <SDL/SDL.h> |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:12:41
|
Update of /cvsroot/simspark/simspark/spark/plugin/rosimporter In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2437 Modified Files: Tag: WIN32 rosimporter.cpp Log Message: - removed the GL/glu.h include Index: rosimporter.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rosimporter/rosimporter.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** rosimporter.cpp 23 Feb 2006 13:40:23 -0000 1.9 --- rosimporter.cpp 28 Feb 2007 08:12:36 -0000 1.9.2.1 *************** *** 21,25 **** */ #include "rosimporter.h" - #include <GL/glu.h> #include <tinyxml/xmlfunctions.h> #include <zeitgeist/logserver/logserver.h> --- 21,24 ---- |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:10:34
|
Update of /cvsroot/simspark/simspark/spark/utility/sfsexp In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1933 Modified Files: Tag: WIN32 Makefile.am Log Message: removed EXTRA_DIST for README Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/Makefile.am,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Makefile.am 19 Dec 2005 19:13:30 -0000 1.1 --- Makefile.am 28 Feb 2007 08:10:30 -0000 1.1.2.1 *************** *** 16,18 **** sexp_ops.h - EXTRA_DIST = README --- 16,17 ---- |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:08:57
|
Update of /cvsroot/simspark/simspark/spark/plugin/rosimporter In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1006 Modified Files: Tag: WIN32 Makefile.am Log Message: - added roselements.h to Makefile Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/rosimporter/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 18 Feb 2006 19:53:06 -0000 1.2 --- Makefile.am 28 Feb 2007 08:08:06 -0000 1.2.2.1 *************** *** 4,7 **** --- 4,8 ---- export.cpp \ roselements.cpp\ + roselements.h \ rosimporter.cpp\ rosimporter.h \ |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:08:26
|
Update of /cvsroot/simspark/simspark/spark/plugin/openglsyssdl In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv707 Modified Files: Tag: WIN32 Makefile.am Log Message: - added openglsystemsdl.h file to Makefile Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/openglsyssdl/Makefile.am,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Makefile.am 13 Dec 2005 21:48:48 -0000 1.1 --- Makefile.am 28 Feb 2007 08:07:15 -0000 1.1.2.1 *************** *** 6,9 **** --- 6,10 ---- export.cpp \ openglsystemsdl.cpp \ + openglsystemsdl.h \ openglsystemsdl_c.cpp |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:06:09
|
Update of /cvsroot/simspark/simspark/spark/test In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32552 Modified Files: Tag: WIN32 Makefile.am Log Message: fixed typo Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/test/Makefile.am,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Makefile.am 19 Dec 2005 20:42:23 -0000 1.1 --- Makefile.am 28 Feb 2007 08:06:05 -0000 1.1.2.1 *************** *** 1,4 **** SUBDIRS = \ ! corestest --- 1,4 ---- SUBDIRS = \ ! coretest |
|
From: Oliver O. <fr...@us...> - 2007-02-28 08:04:18
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31540 Modified Files: Tag: WIN32 Makefile.am Log Message: added test and plugin subdir Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/Makefile.am,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Makefile.am 19 Dec 2005 20:09:16 -0000 1.1 --- Makefile.am 28 Feb 2007 08:04:09 -0000 1.1.2.1 *************** *** 1,4 **** ### utility subdir has to be made first ! SUBDIRS = utility salt zeitgeist oxygen kerosin spark pkginclude_HEADERS = \ --- 1,4 ---- ### utility subdir has to be made first ! SUBDIRS = utility salt zeitgeist oxygen kerosin spark plugin test pkginclude_HEADERS = \ *************** *** 6,9 **** --- 6,11 ---- CLEANFILES = + DISTCLEANFILES = $(top_srcdir)/macosX/SDLMain.o $(top_srcdir)/macosX/libSDLmain.a + EXTRA_DIST = macosX/SDLMain.h macosX/SDLMain.m EXTRA_SRC_DISTS = |
|
From: Oliver O. <fr...@us...> - 2007-02-28 07:59:38
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30282 Modified Files: Tag: WIN32 Makefile.am Log Message: - added jointeffector.h and jointperceptor.h to Makefile - added transformcollider.h to Makefile Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/Makefile.am,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** Makefile.am 27 Feb 2007 23:43:28 -0000 1.3.2.1 --- Makefile.am 28 Feb 2007 07:59:34 -0000 1.3.2.2 *************** *** 167,173 **** nobase_libpkginclude_HEADERS = \ agentaspect/agentaspect.h \ agentaspect/effector.h \ agentaspect/perceptor.h \ - agentaspect/createaction.h \ controlaspect/controlaspect.h \ gamecontrolserver/predicate.h \ --- 167,175 ---- nobase_libpkginclude_HEADERS = \ agentaspect/agentaspect.h \ + agentaspect/createaction.h \ agentaspect/effector.h \ + agentaspect/jointeffector.h \ + agentaspect/jointperceptor.h \ agentaspect/perceptor.h \ controlaspect/controlaspect.h \ gamecontrolserver/predicate.h \ *************** *** 183,186 **** --- 185,189 ---- physicsserver/collisionhandler.h \ physicsserver/contactjointhandler.h \ + physicsserver/dragcontroller.h \ physicsserver/odeobject.h \ physicsserver/odewrapper.h \ *************** *** 191,196 **** physicsserver/space.h \ physicsserver/spherecollider.h \ physicsserver/world.h \ - physicsserver/dragcontroller.h \ physicsserver/velocitycontroller.h \ physicsserver/joint.h \ --- 194,199 ---- physicsserver/space.h \ physicsserver/spherecollider.h \ + physicsserver/transformcollider.h \ physicsserver/world.h \ physicsserver/velocitycontroller.h \ physicsserver/joint.h \ |
|
From: Oliver O. <fr...@us...> - 2007-02-28 07:47:25
|
Update of /cvsroot/simspark/simspark/spark/utility/rcssnet In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25520 Modified Files: Tag: WIN32 Makefile.am Log Message: - added handler.cpp to the Makefile Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/Makefile.am,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Makefile.am 19 Dec 2005 19:13:30 -0000 1.1 --- Makefile.am 28 Feb 2007 07:46:56 -0000 1.1.2.1 *************** *** 4,7 **** --- 4,8 ---- addr.cpp \ exception.cpp \ + handler.cpp \ socket.cpp \ tcpsocket.cpp \ *************** *** 11,14 **** --- 12,16 ---- addr.hpp \ exception.hpp \ + handler.hpp \ iosocketstream.hpp \ isocketstream.hpp \ |
|
From: Oliver O. <fr...@us...> - 2007-02-28 07:45:37
|
Update of /cvsroot/simspark/simspark/spark/utility/tinyxml In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25110 Modified Files: Tag: WIN32 Makefile.am Log Message: - added header files, so they go into the distribution as well Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/tinyxml/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 18 Feb 2006 19:33:59 -0000 1.2 --- Makefile.am 28 Feb 2007 07:45:32 -0000 1.2.2.1 *************** *** 2,10 **** libtinyxml_la_SOURCES = \ ! tinystr.cpp\ ! tinyxml.cpp\ ! tinyxmlerror.cpp\ ! tinyxmlparser.cpp\ ! xmlfunctions.cpp --- 2,13 ---- libtinyxml_la_SOURCES = \ ! tinystr.cpp \ ! tinyxml.cpp \ ! tinyxmlerror.cpp \ ! tinyxmlparser.cpp \ ! xmlfunctions.cpp \ ! tinystr.h \ ! tinyxml.h \ ! xmlfunctions.h |
|
From: Joschka B. <jbo...@us...> - 2007-02-28 06:38:12
|
Update of /cvsroot/simspark/simspark/spark/kerosin/fontserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32703/kerosin/fontserver Modified Files: Tag: WIN32 font.cpp Log Message: use kerosin namespace explicitly to avoid clash with X11 Font type in Linux Index: font.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/fontserver/font.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** font.cpp 28 Feb 2007 04:41:06 -0000 1.1.2.1 --- font.cpp 28 Feb 2007 06:38:07 -0000 1.1.2.2 *************** *** 14,30 **** - using namespace kerosin; using namespace salt; ! Font::Font(FontServer &fontServer) : mTexID(0), mRowHeight(0), mSize(0), mFontServer(fontServer) { } ! Font::~Font() { } ! bool Font::Init(const std::string &name, unsigned int size, FT_Face face) { mName = name; --- 14,29 ---- using namespace salt; ! kerosin::Font::Font(FontServer &fontServer) : mTexID(0), mRowHeight(0), mSize(0), mFontServer(fontServer) { } ! kerosin::Font::~Font() { } ! bool kerosin::Font::Init(const std::string &name, unsigned int size, FT_Face face) { mName = name; *************** *** 201,205 **** } ! bool Font::Bind(int vRows) { glEnable(GL_TEXTURE_2D); --- 200,204 ---- } ! bool kerosin::Font::Bind(int vRows) { glEnable(GL_TEXTURE_2D); *************** *** 227,231 **** } ! void Font::Dump() { glBegin(GL_QUADS); --- 226,230 ---- } ! void kerosin::Font::Dump() { glBegin(GL_QUADS); *************** *** 241,245 **** } ! void Font::DrawString(float x, float y, const char *string) { const char *c = string; --- 240,244 ---- } ! void kerosin::Font::DrawString(float x, float y, const char *string) { const char *c = string; *************** *** 275,279 **** } ! void Font::Printf(float x, float y, const char *format, ...) { char buffer[4096]; --- 274,278 ---- } ! void kerosin::Font::Printf(float x, float y, const char *format, ...) { char buffer[4096]; *************** *** 285,289 **** } ! void Font::RowPrintf(float x, float row, const char *format, ...) { char buffer[4096]; --- 284,288 ---- } ! void kerosin::Font::RowPrintf(float x, float row, const char *format, ...) { char buffer[4096]; *************** *** 295,299 **** } ! float Font::GetStringWidth(const char* string, int numChar) { if (numChar == -1) numChar = strlen(string); --- 294,298 ---- } ! float kerosin::Font::GetStringWidth(const char* string, int numChar) { if (numChar == -1) numChar = strlen(string); *************** *** 318,332 **** } ! float Font::GetRowHeight() { return (float)mRowHeight; } ! const std::string& Font::GetName() const { return mName; } ! unsigned int Font::GetSize() const { return mSize; --- 317,331 ---- } ! float kerosin::Font::GetRowHeight() { return (float)mRowHeight; } ! const std::string& kerosin::Font::GetName() const { return mName; } ! unsigned int kerosin::Font::GetSize() const { return mSize; |
