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-02-23 19:25:54
|
Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6697 Modified Files: Tag: WIN32 netclient.cpp Log Message: - use Socket::SocketDesc to hold a socket handle - fix select call for win32 Index: netclient.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netclient.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** netclient.cpp 9 Feb 2007 20:11:56 -0000 1.2.2.1 --- netclient.cpp 23 Feb 2007 19:25:50 -0000 1.2.2.2 *************** *** 207,211 **** { // test for available data ! int fd = mSocket->getFD(); fd_set readfds; --- 207,211 ---- { // test for available data ! Socket::SocketDesc fd = mSocket->getFD(); fd_set readfds; *************** *** 217,221 **** time.tv_usec = 0; ! int rval = select(fd+1, &readfds, 0, 0, &time ); if (rval == 0) --- 217,227 ---- time.tv_usec = 0; ! #ifdef WIN32 ! int maxFd = 0; ! #else ! int maxFd = fd + 1; ! #endif ! ! int rval = select(maxFd, &readfds, 0, 0, &time ); if (rval == 0) |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:25:08
|
Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6305 Modified Files: Tag: WIN32 netcontrol.cpp netcontrol.h Log Message: - refactor RemoveClient() implementation - rename SendMessage to SendClientMessage. windows.h already #define SendMessage - use Socket::SocketDesc typedef consistently instead of 'int' to describe a socket handle Index: netcontrol.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netcontrol.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** netcontrol.h 24 May 2006 10:07:10 -0000 1.2 --- netcontrol.h 23 Feb 2007 19:25:00 -0000 1.2.2.1 *************** *** 113,122 **** /** sends a message to the given client */ ! void SendMessage(boost::shared_ptr<Client> client, ! const std::string& msg); /** sends a message to the client with the given address */ ! void SendMessage(const rcss::net::Addr& addr, ! const std::string& msg); /** create a socket according to the given ESocketType */ --- 113,122 ---- /** sends a message to the given client */ ! void SendClientMessage(boost::shared_ptr<Client> client, ! const std::string& msg); /** sends a message to the client with the given address */ ! void SendClientMessage(const rcss::net::Addr& addr, ! const std::string& msg); /** create a socket according to the given ESocketType */ *************** *** 162,165 **** --- 162,168 ---- void RemoveClient(const rcss::net::Addr& from); + /** removes a client entry and closes the associated socket. */ + void RemoveClient(TAddrMap::iterator iter); + /** removes all clients marked in the mCloseClients list */ void CloseDeadConnections(); Index: netcontrol.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netcontrol.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 *** netcontrol.cpp 10 Feb 2007 18:59:51 -0000 1.1.2.2 --- netcontrol.cpp 23 Feb 2007 19:25:00 -0000 1.1.2.3 *************** *** 212,223 **** // close all client connections ! for ( ! TAddrMap::iterator iter = mClients.begin(); ! iter != mClients.end(); ! ++iter ! ) ! { ! RemoveClient((*iter).second->addr); ! } // shutdown the server socket --- 212,219 ---- // close all client connections ! while (! mClients.empty()) ! { ! RemoveClient(mClients.begin()); ! } // shutdown the server socket *************** *** 227,231 **** << DescribeSocketType() << std::endl; mSocket.reset(); - mClients.clear(); } --- 223,226 ---- *************** *** 248,264 **** } ! void NetControl::RemoveClient(const Addr& from) { ! TAddrMap::iterator mapIter = mClients.find(from); ! ! if (mapIter == mClients.end()) ! { ! GetLog()->Warning() ! << "(NetControl) '" << GetName() ! << "' RemoveClient called with an unknown client address\n"; ! return; ! } ! ! shared_ptr<Client> client = (*mapIter).second; ClientDisconnect(client); --- 243,249 ---- } ! void NetControl::RemoveClient(TAddrMap::iterator iter) { ! shared_ptr<Client> client = (*iter).second; ClientDisconnect(client); *************** *** 269,273 **** << ((socket.get() != 0) ? "TCP" : "UDP") << " connection from '" ! << from.getHostStr() << ":" << from.getPort() << "' id " << client->id << endl; --- 254,258 ---- << ((socket.get() != 0) ? "TCP" : "UDP") << " connection from '" ! << client->addr.getHostStr() << ":" << client->addr.getPort() << "' id " << client->id << endl; *************** *** 277,281 **** } ! mClients.erase(mapIter); } --- 262,281 ---- } ! mClients.erase(iter); ! } ! ! void NetControl::RemoveClient(const Addr& from) ! { ! TAddrMap::iterator mapIter = mClients.find(from); ! ! if (mapIter == mClients.end()) ! { ! GetLog()->Warning() ! << "(NetControl) '" << GetName() ! << "' RemoveClient called with an unknown client address\n"; ! return; ! } ! ! RemoveClient(mapIter); } *************** *** 290,294 **** } ! void NetControl::SendMessage(shared_ptr<Client> client, const string& msg) { if (client.get() == 0) --- 290,294 ---- } ! void NetControl::SendClientMessage(shared_ptr<Client> client, const string& msg) { if (client.get() == 0) *************** *** 322,326 **** } ! void NetControl::SendMessage(const Addr& addr, const string& msg) { TAddrMap::iterator iter = mClients.find(addr); --- 322,326 ---- } ! void NetControl::SendClientMessage(const Addr& addr, const string& msg) { TAddrMap::iterator iter = mClients.find(addr); *************** *** 334,338 **** } ! SendMessage((*iter).second,msg); } --- 334,338 ---- } ! SendClientMessage((*iter).second,msg); } *************** *** 359,363 **** for(;;) { ! int ret = select(fd+1, &readfds, 0, 0, &time); if (ret == 0) --- 359,370 ---- for(;;) { ! #ifdef WIN32 ! // maxFd is ignored on Win32 and is present just for api compatibility ! int maxFd = 0; ! #else ! int maxFd = fd + 1; ! #endif ! ! int ret = select(maxFd, &readfds, 0, 0, &time); if (ret == 0) *************** *** 486,490 **** } ! int fd = mSocket->getFD(); fd_set readfds; --- 493,497 ---- } ! Socket::SocketDesc fd = mSocket->getFD(); fd_set readfds; *************** *** 498,502 **** for(;;) { ! int ret = select(fd+1, &readfds, 0, 0, &time); if (ret == 0) --- 505,516 ---- for(;;) { ! #ifdef WIN32 ! // maxFd is ignored on Win32 and is present just for api compatibility ! int maxFd = 0; ! #else ! int maxFd = fd + 1; ! #endif ! ! int ret = select(maxFd, &readfds, 0, 0, &time); if (ret == 0) *************** *** 542,545 **** --- 556,564 ---- void NetControl::ReadTCPMessages() { + if (mClients.empty()) + { + return; + } + // generate a set of client socket fds fd_set client_fds; *************** *** 554,559 **** ) { ! const int fd = (*iter).second->socket->getFD(); maxFd = std::max<int>(fd,maxFd); FD_SET(fd,&client_fds); } --- 573,583 ---- ) { ! const Socket::SocketDesc fd = (*iter).second->socket->getFD(); ! #ifdef WIN32 ! // maxFd is ignored for Win32 ! maxFd = 0; ! #else maxFd = std::max<int>(fd,maxFd); + #endif FD_SET(fd,&client_fds); } *************** *** 592,596 **** ) { ! const int fd = (*iter).second->socket->getFD(); if (! FD_ISSET(fd, &test_fds)) { --- 616,620 ---- ) { ! const Socket::SocketDesc fd = (*iter).second->socket->getFD(); if (! FD_ISSET(fd, &test_fds)) { *************** *** 607,611 **** } else { ! if (rval < 0) { GetLog()->Error() --- 631,635 ---- } else { ! if (rval <= 0) { GetLog()->Error() *************** *** 613,622 **** << "' recv returned error on a client socket '" << strerror(errno) << "' " << endl; - continue; } - // (rval==0) indicates a close() on - // the client side - // mark the client connection to be // closed and exclude it from further --- 637,642 ---- |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:23:00
|
Update of /cvsroot/simspark/simspark/spark/oxygen/monitorserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5505 Modified Files: Tag: WIN32 monitorserver.cpp monitorserver.h Log Message: - rename GetMonitorInfo() to GetMonitorData(). windows.h already #defines GetMonitorInfo Index: monitorserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/monitorserver/monitorserver.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** monitorserver.h 5 Dec 2005 21:16:49 -0000 1.1 --- monitorserver.h 23 Feb 2007 19:22:57 -0000 1.1.2.1 *************** *** 64,68 **** * done by the simulation engine */ ! std::string GetMonitorInfo(); /** If a monitor sends information to the world model, this --- 64,68 ---- * done by the simulation engine */ ! std::string GetMonitorData(); /** If a monitor sends information to the world model, this Index: monitorserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/monitorserver/monitorserver.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** monitorserver.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- monitorserver.cpp 23 Feb 2007 19:22:54 -0000 1.1.2.1 *************** *** 162,166 **** } ! string MonitorServer::GetMonitorInfo() { shared_ptr<MonitorSystem> monitorSystem = GetMonitorSystem(); --- 162,166 ---- } ! string MonitorServer::GetMonitorData() { shared_ptr<MonitorSystem> monitorSystem = GetMonitorSystem(); |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:21:23
|
Update of /cvsroot/simspark/simspark/spark/kerosin/textureserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5018/textureserver Modified Files: Tag: WIN32 texture.cpp texture2d.cpp Log Message: - use openglwrapper.h Index: texture.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/textureserver/texture.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 *** texture.cpp 16 Feb 2007 15:40:49 -0000 1.1.2.1 --- texture.cpp 23 Feb 2007 19:21:10 -0000 1.1.2.2 *************** *** 21,25 **** */ #include "texture.h" ! #include "../openglserver/openglserver.h" using namespace boost; --- 21,25 ---- */ #include "texture.h" ! #include <kerosin/openglserver/openglwrapper.h> using namespace boost; Index: texture2d.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/textureserver/texture2d.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 *** texture2d.cpp 16 Feb 2007 15:40:49 -0000 1.1.2.1 --- texture2d.cpp 23 Feb 2007 19:21:10 -0000 1.1.2.2 *************** *** 21,25 **** */ #include "texture2d.h" ! #include <kerosin/openglserver/openglserver.h> #include <kerosin/imageserver/image.h> --- 21,25 ---- */ #include "texture2d.h" ! #include <kerosin/openglserver/openglwrapper.h> #include <kerosin/imageserver/image.h> |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:21:15
|
Update of /cvsroot/simspark/simspark/spark/kerosin/renderserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5018/renderserver Modified Files: Tag: WIN32 renderserver.cpp Log Message: - use openglwrapper.h Index: renderserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/renderserver/renderserver.cpp,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** renderserver.cpp 16 Feb 2007 15:40:47 -0000 1.2.2.2 --- renderserver.cpp 23 Feb 2007 19:21:10 -0000 1.2.2.3 *************** *** 25,29 **** #include <oxygen/sceneserver/scene.h> #include <oxygen/sceneserver/camera.h> ! #include <kerosin/openglserver/openglserver.h> #include <kerosin/sceneserver/staticmesh.h> #include <kerosin/sceneserver/light.h> --- 25,29 ---- #include <oxygen/sceneserver/scene.h> #include <oxygen/sceneserver/camera.h> ! #include <kerosin/openglserver/openglwrapper.h> #include <kerosin/sceneserver/staticmesh.h> #include <kerosin/sceneserver/light.h> |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:21:15
|
Update of /cvsroot/simspark/simspark/spark/kerosin/sceneserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5018/sceneserver Modified Files: Tag: WIN32 axis.cpp light.cpp staticmesh.cpp Log Message: - use openglwrapper.h Index: light.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/light.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 *** light.cpp 16 Feb 2007 15:40:48 -0000 1.1.2.2 --- light.cpp 23 Feb 2007 19:21:10 -0000 1.1.2.3 *************** *** 25,36 **** */ #include "light.h" - #include <kerosin/renderserver/renderserver.h> #include <zeitgeist/logserver/logserver.h> ! ! /* ! // define the symbol BOOL to prevent opcode.h to typedef BOOL ! #define BOOL BOOL ! #include <opcode/Opcode.h> ! */ using namespace boost; --- 25,31 ---- */ #include "light.h" #include <zeitgeist/logserver/logserver.h> ! #include <kerosin/openglserver/openglwrapper.h> ! #include <kerosin/renderserver/renderserver.h> using namespace boost; Index: axis.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/axis.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** axis.cpp 15 Feb 2006 00:59:02 -0000 1.2 --- axis.cpp 23 Feb 2007 19:21:10 -0000 1.2.2.1 *************** *** 21,25 **** */ #include "axis.h" ! #include "../openglserver/openglserver.h" #include <kerosin/openglserver/glbase.h> --- 21,25 ---- */ #include "axis.h" ! #include "../openglserver/openglwrapper.h" #include <kerosin/openglserver/glbase.h> Index: staticmesh.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/staticmesh.cpp,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** staticmesh.cpp 18 Feb 2007 12:03:53 -0000 1.2.2.2 --- staticmesh.cpp 23 Feb 2007 19:21:10 -0000 1.2.2.3 *************** *** 22,26 **** #include "staticmesh.h" #include <zeitgeist/logserver/logserver.h> ! #include <kerosin/openglserver/openglserver.h> #include <kerosin/materialserver/material.h> #include <kerosin/materialserver/materialserver.h> --- 22,26 ---- #include "staticmesh.h" #include <zeitgeist/logserver/logserver.h> ! #include <kerosin/openglserver/openglwrapper.h> #include <kerosin/materialserver/material.h> #include <kerosin/materialserver/materialserver.h> |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:21:15
|
Update of /cvsroot/simspark/simspark/spark/kerosin/materialserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5018/materialserver Modified Files: Tag: WIN32 material2dtexture.cpp materialsolid.cpp Log Message: - use openglwrapper.h Index: materialsolid.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/materialsolid.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** materialsolid.cpp 18 Feb 2006 19:41:48 -0000 1.2 --- materialsolid.cpp 23 Feb 2007 19:21:09 -0000 1.2.2.1 *************** *** 21,24 **** --- 21,25 ---- */ #include "materialsolid.h" + #include <kerosin/openglserver/openglwrapper.h> #include <kerosin/openglserver/openglserver.h> Index: material2dtexture.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/material2dtexture.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 *** material2dtexture.cpp 10 Feb 2007 16:18:00 -0000 1.1.2.1 --- material2dtexture.cpp 23 Feb 2007 19:21:09 -0000 1.1.2.2 *************** *** 21,29 **** */ #include "material2dtexture.h" #include <kerosin/textureserver/textureserver.h> #include <kerosin/textureserver/texture.h> #include <kerosin/openglserver/openglserver.h> - #include <zeitgeist/logserver/logserver.h> - #include <zeitgeist/scriptserver/scriptserver.h> using namespace zeitgeist; --- 21,30 ---- */ #include "material2dtexture.h" + #include <zeitgeist/logserver/logserver.h> + #include <zeitgeist/scriptserver/scriptserver.h> #include <kerosin/textureserver/textureserver.h> #include <kerosin/textureserver/texture.h> + #include <kerosin/openglserver/openglwrapper.h> #include <kerosin/openglserver/openglserver.h> using namespace zeitgeist; |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:19:56
|
Update of /cvsroot/simspark/simspark/spark/kerosin/openglserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4152 Added Files: Tag: WIN32 openglwrapper.h Log Message: - move platform specific opengl includes to openglwrapper.h --- NEW FILE: openglwrapper.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2002,2003 Koblenz University Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group $Id: openglwrapper.h,v 1.1.2.1 2007/02/23 19:19:45 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define GL_GLEXT_PROTOTYPES #ifdef WIN32 #define WIN32_LEAN_AND_MEAN 1 #include <windows.h> #endif #include <GL/gl.h> #include <GL/glext.h> #if defined(WIN32) #include <GL/wglext.h> #else #include <GL/glx.h> #include <GL/glxext.h> #endif |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:19:23
|
Update of /cvsroot/simspark/simspark/spark/kerosin/openglserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4119 Modified Files: Tag: WIN32 openglserver.cpp openglserver.h Log Message: - further cleanup of openglserver Index: openglserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/openglserver/openglserver.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 *** openglserver.cpp 10 Feb 2007 16:17:28 -0000 1.1.2.1 --- openglserver.cpp 23 Feb 2007 19:19:15 -0000 1.1.2.2 *************** *** 20,25 **** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include "openglserver.h" #include "openglsystem.h" #include <zeitgeist/scriptserver/scriptserver.h> --- 20,25 ---- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "openglserver.h" + #include "openglwrapper.h" #include "openglsystem.h" #include <zeitgeist/scriptserver/scriptserver.h> *************** *** 86,160 **** } - unsigned int OpenGLServer::LoadARBProgram(GLenum /*target*/, const char* /*fileName*/) - { - #if 0 - // only try to load stuff if the extension is supported - if (!mExtensionReg->Has_GL_ARB_vertex_program()) - { - return 0; - } - - // before actually loading, try the cache - MapHolder::TProgramCache::iterator entry = mHolder->mPrograms.find(fileName); - - if (entry != mHolder->mPrograms.end()) - { - // we already have a match - return (*entry).second; - } - - unsigned int id = 0; - - // open file - shared_ptr<FileServer> fileServer = shared_static_cast<FileServer>(GetCore()->Get("/sys/server/file")); - salt::RFile *file = fileServer->Open(fileName); - - if (!file) return 0; - - unsigned char *buffer = new unsigned char[file->Size()+1]; - file->Read(buffer, file->Size()); - - glGenProgramsARB(1, &id); - glBindProgramARB(target, id); - - // try to load the actual program - glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, file->Size(), buffer); - - // free memory - delete file; - delete []buffer; - - const unsigned char* error = glGetString(GL_PROGRAM_ERROR_STRING_ARB); - - // if an error occured, display error message - if (error[0] != 0) - { - int i; - glDeleteProgramsARB(1, &id); - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &i); - GetCore()->GetLogServer()->Error() << "ERROR: Loading ARB program (Pos: " << i << ")..." << endl; - GetCore()->GetLogServer()->Error() << " => " << error << endl; - return 0; - } - - // enter program into the cache - mHolder->mPrograms[fileName] = id; - - return id; - #else - return 0; - #endif - } - - unsigned int OpenGLServer::LoadARBVertexProgram(const char* fileName) - { - return 0; - } - - unsigned int OpenGLServer::LoadARBFragmentProgram(const char* /*fileName*/) - { - return 0; - } - bool OpenGLServer::Init(const string& openGLSysName) { --- 86,89 ---- *************** *** 203,214 **** } - void OpenGLServer::ToggleFancyLighting() - { - if (mSupportsFancyLighting) - mSupportsFancyLighting = false; - else - mSupportsFancyLighting = true; - } - int OpenGLServer::AllocLight() --- 132,135 ---- *************** *** 245,249 **** static _ptr proc = (_ptr) GetExtension(#_function); ! void OpenGLServer::glActiveTextureARB(GLenum texture) { PROC_ADDRESS(PFNGLACTIVETEXTUREARBPROC, "glActiveTextureARB"); --- 166,170 ---- static _ptr proc = (_ptr) GetExtension(#_function); ! void OpenGLServer::glActiveTextureARB(unsigned int texture) { PROC_ADDRESS(PFNGLACTIVETEXTUREARBPROC, "glActiveTextureARB"); *************** *** 254,257 **** } ! (proc)(texture); } --- 175,178 ---- } ! (proc)(static_cast<GLenum>(texture)); } Index: openglserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/openglserver/openglserver.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** openglserver.h 10 Feb 2007 16:17:28 -0000 1.1.2.1 --- openglserver.h 23 Feb 2007 19:19:15 -0000 1.1.2.2 *************** *** 28,48 **** #include <zeitgeist/leaf.h> - #define GL_GLEXT_PROTOTYPES - - #ifdef WIN32 - #define WIN32_LEAN_AND_MEAN 1 - #include <windows.h> - #endif - - #include <GL/gl.h> - #include <GL/glext.h> - - #if defined(WIN32) - #include <GL/wglext.h> - #else - #include <GL/glx.h> - #include <GL/glxext.h> - #endif - namespace kerosin { --- 28,31 ---- *************** *** 60,70 **** // protected: - //! this structure will be used to map program names to OpenGL IDs - // #if HAVE_HASH_MAP - // typedef std::hash_map<std::string, unsigned int> TProgramCache; - // #else - // typedef std::map<std::string, unsigned int> TProgramCache; - // #endif - //! set of OpenGL light constants typedef std::set<int> TLightSet; --- 43,46 ---- *************** *** 96,111 **** void SwapBuffers() const; - //! vertex and fragment program loading - unsigned int LoadARBProgram(GLenum target, const char* fileName); - - //! vertex and fragment program loading - unsigned int LoadARBVertexProgram(const char* fileName); - - //! vertex and fragment program loading - unsigned int LoadARBFragmentProgram(const char* fileName); - - bool SupportsFancyLighting() const { return mSupportsFancyLighting; } - void ToggleFancyLighting(); - /** returns the next availble GL light constant or -1 if no more lights are available --- 72,75 ---- *************** *** 120,124 **** /** looksup and calls glActiveTextureARB extension if available */ ! static void glActiveTextureARB(GLenum texture); protected: --- 84,88 ---- /** looksup and calls glActiveTextureARB extension if available */ ! static void glActiveTextureARB(unsigned int texture); protected: |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:18:10
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/randomserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3342 Modified Files: Tag: WIN32 randomserver.cpp randomserver.h Log Message: - move Seed() to randomserver.cpp. Prevent inclusion of windows.h in public randomserver header. Index: randomserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/randomserver/randomserver.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** randomserver.h 9 Feb 2007 16:16:51 -0000 1.1.2.1 --- randomserver.h 23 Feb 2007 19:18:02 -0000 1.1.2.2 *************** *** 27,34 **** #include <zeitgeist/node.h> - #ifndef WIN32 - #include <sys/time.h> - #endif - namespace zeitgeist { --- 27,30 ---- *************** *** 47,60 **** /** set a random seed */ ! void Seed(salt::RandomEngine::result_type seed) ! { ! if (seed == 0) ! { ! timeval tv; ! gettimeofday(&tv,0); ! seed = tv.tv_usec; ! } ! salt::RandomEngine::instance(seed); ! } /** get a uniformly distributed random number */ --- 43,47 ---- /** set a random seed */ ! void Seed(salt::RandomEngine::result_type seed); /** get a uniformly distributed random number */ Index: randomserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/randomserver/randomserver.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** randomserver.cpp 5 Dec 2005 21:05:01 -0000 1.1 --- randomserver.cpp 23 Feb 2007 19:18:01 -0000 1.1.2.1 *************** *** 22,32 **** */ #include "randomserver.h" - #include <cmath> ! #if 0 void RandomServer::Seed(salt::RandomEngine::result_type seed) { ! salt::RandomEngine.instance(seed); ! } #endif --- 22,50 ---- */ #include "randomserver.h" ! #ifdef WIN32 ! #include <windows.h> ! #else ! #include <sys/time.h> ! #endif ! ! using namespace zeitgeist; ! void RandomServer::Seed(salt::RandomEngine::result_type seed) { ! if (seed == 0) ! { ! #ifdef WIN32 ! SYSTEMTIME time; ! GetSystemTime(&time); ! seed = time.wMilliseconds; ! #else ! timeval tv; ! gettimeofday(&tv,0); ! seed = tv.tv_usec; #endif + } + + salt::RandomEngine::instance(seed); + } |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:16:39
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2926 Modified Files: Tag: WIN32 scriptserver.cpp Log Message: - include rubywrapper.h. Ruby was previously indirectly visible through gcvalue.h Index: scriptserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver.cpp,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** scriptserver.cpp 10 Feb 2007 18:55:57 -0000 1.2.2.2 --- scriptserver.cpp 23 Feb 2007 19:16:33 -0000 1.2.2.3 *************** *** 25,28 **** --- 25,29 ---- #include <salt/fileclasses.h> #include "scriptserver.h" + #include "rubywrapper.h" #include <zeitgeist/corecontext.h> #include <zeitgeist/core.h> |
|
From: Markus R. <rol...@us...> - 2007-02-23 19:15:21
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2461 Modified Files: Tag: WIN32 gcvalue.cpp gcvalue.h Log Message: - don't include rubywrapper in gcvalue.h. Otherwise ruby.h is visible throughout the whole project Index: gcvalue.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/gcvalue.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** gcvalue.h 5 Dec 2005 21:05:01 -0000 1.1 --- gcvalue.h 23 Feb 2007 19:15:14 -0000 1.1.2.1 *************** *** 24,28 **** #define ZEITGEIST_GCVALUE_H ! #include <zeitgeist/scriptserver/rubywrapper.h> namespace zeitgeist --- 24,31 ---- #define ZEITGEIST_GCVALUE_H ! typedef unsigned long VALUE; ! typedef unsigned long ID; ! ! #include <string> namespace zeitgeist Index: gcvalue.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/gcvalue.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** gcvalue.cpp 5 Dec 2005 21:05:01 -0000 1.1 --- gcvalue.cpp 23 Feb 2007 19:15:14 -0000 1.1.2.1 *************** *** 21,24 **** --- 21,25 ---- */ #include "gcvalue.h" + #include "rubywrapper.h" #include <sstream> |
|
From: Markus R. <rol...@us...> - 2007-02-22 16:06:06
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16868 Modified Files: Tag: WIN32 constants.cpp Log Message: - set SIM_SIMSTEP to 0.002 to match rcssserver3d/simspark behavior (with the changd CFM it is now stable) Index: constants.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/constants.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 *** constants.cpp 21 Feb 2007 20:11:34 -0000 1.1.2.1 --- constants.cpp 22 Feb 2007 16:06:01 -0000 1.1.2.2 *************** *** 21,24 **** //! default simulation stepping [sec] ! const float SIM_SIMSTEP = 0.015f; --- 21,24 ---- //! default simulation stepping [sec] ! const float SIM_SIMSTEP = 0.02f; |
|
From: Markus R. <rol...@us...> - 2007-02-22 16:04:43
|
Update of /cvsroot/simspark/simspark/spark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16467 Modified Files: Tag: WIN32 spark.rb Log Message: - define $physicsGlobalCFM andd $physicsGlobalGravity constants that affect physics globally - set CFM to 0.001 to match rcssserver3d/simspark behavior Index: spark.rb =================================================================== RCS file: /cvsroot/simspark/simspark/spark/spark/spark.rb,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** spark.rb 15 Feb 2007 21:06:21 -0000 1.5.2.1 --- spark.rb 22 Feb 2007 16:04:39 -0000 1.5.2.2 *************** *** 41,44 **** --- 41,49 ---- $monitorType = 'tcp' + # (Global Physics / World) constants + # + $physicsGlobalCFM = 0.001 + $physicsGlobalGravity = -9.81 + # # below is a set of utility functions for the user app *************** *** 52,56 **** # (re-)create world and space aspects world = new('oxygen/World', $scenePath+'world') ! world.setGravity(0.0, 0.0, -9.81) new('oxygen/Space', $scenePath+'space') --- 57,62 ---- # (re-)create world and space aspects world = new('oxygen/World', $scenePath+'world') ! world.setGravity(0.0, 0.0, $physicsGlobalGravity) ! world.setCFM($physicsGlobalCFM) new('oxygen/Space', $scenePath+'space') |
|
From: Markus R. <rol...@us...> - 2007-02-21 20:12:34
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30321 Modified Files: Tag: WIN32 mainframe.cpp Log Message: - support discrete simulation stepping Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.8.2.7 retrieving revision 1.8.2.8 diff -C2 -d -r1.8.2.7 -r1.8.2.8 *** mainframe.cpp 18 Feb 2007 14:25:14 -0000 1.8.2.7 --- mainframe.cpp 21 Feb 2007 20:12:25 -0000 1.8.2.8 *************** *** 417,421 **** } ! sim->SetSimStep(0.0); sim->Init(0,0); sim->SetAutoTimeMode(false); --- 417,421 ---- } ! sim->SetSimStep(SIM_SIMSTEP); sim->Init(0,0); sim->SetAutoTimeMode(false); *************** *** 456,464 **** while (! sim->WantsToQuit()) { ! wxLongLong tNow = wxGetLocalTimeMillis(); ! float tDeltaSec = (tNow - tLast).ToLong() / 1000.0; ! tLast = tNow; ! AdvanceSimulation(sim, tDeltaSec); // pump the wxWidgets message loop --- 456,470 ---- while (! sim->WantsToQuit()) { ! if (SIM_SIMSTEP > 0.0f) ! { ! AdvanceSimulation(sim, SIM_SIMSTEP); ! } else ! { ! wxLongLong tNow = wxGetLocalTimeMillis(); ! float tDeltaSec = (tNow - tLast).ToLong() / 1000.0; ! tLast = tNow; ! AdvanceSimulation(sim, tDeltaSec); ! } // pump the wxWidgets message loop *************** *** 627,631 **** InitSimulation(sim); ! AdvanceSimulation(sim, 0.01f); DoneSimulation(sim); --- 633,645 ---- InitSimulation(sim); ! ! if (SIM_SIMSTEP > 0.0) ! { ! AdvanceSimulation(sim, SIM_SIMSTEP); ! } else ! { ! AdvanceSimulation(sim, 0.01f); ! } ! DoneSimulation(sim); |
|
From: Markus R. <rol...@us...> - 2007-02-21 20:11:41
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29843 Modified Files: Tag: WIN32 constants.h rsgedit.vcproj Added Files: Tag: WIN32 constants.cpp Log Message: - define default simulation stepping to 0.015s Index: rsgedit.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/rsgedit.vcproj,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** rsgedit.vcproj 18 Feb 2007 14:25:16 -0000 1.1.2.6 --- rsgedit.vcproj 21 Feb 2007 20:11:34 -0000 1.1.2.7 *************** *** 184,187 **** --- 184,191 ---- </File> <File + RelativePath=".\constants.cpp" + > + </File> + <File RelativePath=".\icon1.ico" > Index: constants.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/constants.h,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** constants.h 18 Feb 2007 13:50:48 -0000 1.1.2.4 --- constants.h 21 Feb 2007 20:11:33 -0000 1.1.2.5 *************** *** 21,24 **** --- 21,26 ---- #define RSGEDIT_CONSTANTS_H + #include <wx/defs.h> + enum ESimState { *************** *** 42,44 **** --- 44,49 ---- }; + //! default simulation stepping [sec] + extern const float SIM_SIMSTEP; + #endif // RSGEDIT_CONSTANTS_H --- NEW FILE: constants.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: constants.cpp,v 1.1.2.1 2007/02/21 20:11:34 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "constants.h" //! default simulation stepping [sec] const float SIM_SIMSTEP = 0.015f; |
|
From: Markus R. <rol...@us...> - 2007-02-21 20:11:31
|
Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29719 Modified Files: Tag: WIN32 simulationserver.cpp Log Message: - fix GameControlServer update for non discrete simulation stepping Index: simulationserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/simulationserver.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** simulationserver.cpp 16 Feb 2007 15:42:56 -0000 1.3.2.1 --- simulationserver.cpp 21 Feb 2007 20:11:00 -0000 1.3.2.2 *************** *** 201,205 **** // simulate passed time in one single step mSceneServer->Update(mSumDeltaTime); ! mGameControlServer->Update(mSimStep); mSimTime += mSumDeltaTime; mSumDeltaTime = 0; --- 201,205 ---- // simulate passed time in one single step mSceneServer->Update(mSumDeltaTime); ! mGameControlServer->Update(mSumDeltaTime); mSimTime += mSumDeltaTime; mSumDeltaTime = 0; |
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2377 Modified Files: Tag: WIN32 main.cpp mainframe.cpp mainframe.h rsgedit.vcproj rsgedit.wxg Added Files: Tag: WIN32 aboutDlg.cpp aboutDlg.h Log Message: - added a simple About Dialog --- NEW FILE: aboutDlg.h --- // -*- C++ -*- generated by wxGlade 0.4.1 on Sun Feb 18 14:55:33 2007 #include <wx/wx.h> #include <wx/image.h> #ifndef ABOUTDLG_H #define ABOUTDLG_H // begin wxGlade: ::dependencies // end wxGlade class aboutDlg: public wxDialog { public: // begin wxGlade: aboutDlg::ids // end wxGlade aboutDlg(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE); private: // begin wxGlade: aboutDlg::methods void set_properties(); void do_layout(); // end wxGlade protected: // begin wxGlade: aboutDlg::attributes wxStaticBitmap* mBitmap; wxStaticText* label_1; wxButton* button_1; // end wxGlade }; // wxGlade: end class #endif // ABOUTDLG_H Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.7.2.5 retrieving revision 1.7.2.6 diff -C2 -d -r1.7.2.5 -r1.7.2.6 *** mainframe.h 18 Feb 2007 08:53:31 -0000 1.7.2.5 --- mainframe.h 18 Feb 2007 14:25:15 -0000 1.7.2.6 *************** *** 96,99 **** --- 96,101 ---- void OnUpdateFileReload(wxUpdateUIEvent& event); + void OnHelpAbout(wxCommandEvent& event); + void OnExit(wxCommandEvent& event); void OnClose( wxCloseEvent& event ); Index: rsgedit.wxg =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.wxg,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** rsgedit.wxg 16 Feb 2007 17:08:35 -0000 1.4.2.3 --- rsgedit.wxg 18 Feb 2007 14:25:17 -0000 1.4.2.4 *************** *** 1,4 **** <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Fri Feb 16 18:07:47 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 Sun Feb 18 15:24:05 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"> *************** *** 51,54 **** --- 51,60 ---- </item> </menu> + <menu name="" itemid="ID_HELP" label="&Help"> + <item> + <label>&About</label> + <id>ID_HELP_ABOUT</id> + </item> + </menu> </menus> </object> *************** *** 183,185 **** --- 189,225 ---- </object> </object> + <object class="aboutDlg" name="dialog_1" base="EditDialog"> + <style>wxDEFAULT_DIALOG_STYLE</style> + <title>dialog_1</title> + <object class="wxBoxSizer" name="sizer_9" base="EditBoxSizer"> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE</flag> + <border>5</border> + <option>0</option> + <object class="wxStaticBitmap" name="mBitmap" base="EditStaticBitmap"> + <attribute>1</attribute> + <size>500, 200</size> + </object> + </object> + <object class="sizeritem"> + <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE</flag> + <border>5</border> + <option>0</option> + <object class="wxStaticText" name="label_1" base="EditStaticText"> + <attribute>1</attribute> + <label>SimSpark Copyright (C) RoboCup Soccer Server 3D Maintenance Group</label> + </object> + </object> + <object class="sizeritem"> + <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE</flag> + <border>5</border> + <option>0</option> + <object class="wxButton" name="button_1" base="EditButton"> + <label>&Ok</label> + <id>wxID_OK</id> + </object> + </object> + </object> + </object> </application> Index: main.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/main.cpp,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -d -r1.6.2.3 -r1.6.2.4 *** main.cpp 18 Feb 2007 13:50:50 -0000 1.6.2.3 --- main.cpp 18 Feb 2007 14:25:10 -0000 1.6.2.4 *************** *** 57,61 **** ( wxBitmap(xpm_sparklogo), ! wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT, 0, NULL, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxSTAY_ON_TOP --- 57,61 ---- ( wxBitmap(xpm_sparklogo), ! wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_NO_TIMEOUT, 0, NULL, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxSTAY_ON_TOP Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.8.2.6 retrieving revision 1.8.2.7 diff -C2 -d -r1.8.2.6 -r1.8.2.7 *** mainframe.cpp 18 Feb 2007 08:53:31 -0000 1.8.2.6 --- mainframe.cpp 18 Feb 2007 14:25:14 -0000 1.8.2.7 *************** *** 31,34 **** --- 31,36 ---- #include <rsgedit/res/xpm_reload.xpm> + #include "aboutdlg.h" + //! wxWidgets and zeitgeist both use a 'DECLARE_CLASS' macro #undef DECLARE_CLASS *************** *** 63,66 **** --- 65,70 ---- EVT_UPDATE_UI(ID_FILE_RELOAD, mainframe::OnUpdateFileReload) + EVT_MENU(ID_HELP_ABOUT, mainframe::OnHelpAbout) + EVT_TIMER(1, mainframe::OnLogTimer) *************** *** 116,119 **** --- 120,126 ---- wxglade_tmp_menu_3->Append(ID_SIM_PAUSE, wxT("&Pause"), wxT("Pause Simulation"), wxITEM_NORMAL); MainFrame_menubar->Append(wxglade_tmp_menu_3, wxT("&Simulation")); + wxMenu* wxglade_tmp_menu_4 = new wxMenu(); + wxglade_tmp_menu_4->Append(ID_HELP_ABOUT, wxT("&About"), wxT(""), wxITEM_NORMAL); + MainFrame_menubar->Append(wxglade_tmp_menu_4, wxT("&Help")); MainFrame_statusbar = CreateStatusBar(1, 0); mCtrPropList = new wxListCtrl(window_1_pane_1, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER); *************** *** 657,658 **** --- 664,671 ---- OpenSimulation(mSimFName); } + + void mainframe::OnHelpAbout(wxCommandEvent& event) + { + aboutDlg dlg(this, wxID_ANY, "About SimSpark"); + dlg.ShowModal(); + } --- NEW FILE: aboutDlg.cpp --- // -*- C++ -*- generated by wxGlade 0.4.1 on Sun Feb 18 14:55:33 2007 #include "aboutDlg.h" #include <rsgedit/res/xpm_sparklogo.xpm> aboutDlg::aboutDlg(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style): wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE) { // begin wxGlade: aboutDlg::aboutDlg mBitmap = new wxStaticBitmap(this, -1, wxNullBitmap); label_1 = new wxStaticText(this, -1, wxT("SimSpark Copyright (C) RoboCup Soccer Server 3D Maintenance Group")); button_1 = new wxButton(this, wxID_OK, wxT("&Ok")); set_properties(); do_layout(); // end wxGlade mBitmap->SetBitmap(wxBitmap(xpm_sparklogo)); Layout(); } void aboutDlg::set_properties() { // begin wxGlade: aboutDlg::set_properties SetTitle(wxT("dialog_1")); mBitmap->SetMinSize(wxSize(500, 200)); // end wxGlade } void aboutDlg::do_layout() { // begin wxGlade: aboutDlg::do_layout wxBoxSizer* sizer_9 = new wxBoxSizer(wxVERTICAL); sizer_9->Add(mBitmap, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 5); sizer_9->Add(label_1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 5); sizer_9->Add(button_1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 5); SetAutoLayout(true); SetSizer(sizer_9); sizer_9->Fit(this); sizer_9->SetSizeHints(this); Layout(); // end wxGlade } Index: rsgedit.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/rsgedit.vcproj,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** rsgedit.vcproj 15 Feb 2007 10:58:39 -0000 1.1.2.5 --- rsgedit.vcproj 18 Feb 2007 14:25:16 -0000 1.1.2.6 *************** *** 176,179 **** --- 176,187 ---- <Files> <File + RelativePath=".\aboutDlg.cpp" + > + </File> + <File + RelativePath=".\aboutDlg.h" + > + </File> + <File RelativePath=".\icon1.ico" > |
|
From: Markus R. <rol...@us...> - 2007-02-18 13:51:06
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit/res In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21147/res Added Files: Tag: WIN32 xpm_sparklogo.xpm Log Message: - add a simple splash screen --- NEW FILE: xpm_sparklogo.xpm --- /* XPM */ static char *xpm_sparklogo[] = { /* columns rows colors chars-per-pixel */ "500 200 203 2", " c #FCFEFC", "4 c #9CAA84", "{ c #D4D2D4", "5 c #9CAA8C", "u. c #8C8E8C", "f c #BCC2AC", "`. c #FCF2E4", "6. c #747E64", "S c #9CAA94", "!. c #646264", "~. c #1C1E1C", "b c #BCC2B4", " X c #FCE6C4", "* c #DCDAD4", "6 c #A4B28C", "'. c #FCE6CC", "4. c #DCDADC", "1 c #A4B294", "p. c #949694", "<X c #FCDAAC", "9 c #C4CAB4", ">. c #7C866C", "c c #A4B29C", "P. c #6C6A6C", "(. c #FCDAB4", "i. c #242624", "L c #C4CABC", "J c #E4E2DC", "%X c #FCCE94", "@. c #C4CAC4", "%. c #E4E2E4", "i c #ACBA9C", "l. c #9C9E9C", ".. c #647654", "- c #CCD2BC", "| c #848E74", ":X c #FCC27C", "b. c #747274", "N. c #2C2E2C", "0 c #CCD2C4", "@ c #ECEAE4", "r. c #040204", "/ c #CCD2CC", "]. c #FCB664", "' c #ECEAEC", "Z c #B4C2A4", "B. c #A4A6A4", ";. c #6C7E5C", "e c #D4DAC4", "$X c #FCAA44", "1. c #8C967C", "M c #B4C2AC", "v. c #7C7A7C", "2. c #6C7E64", "Y. c #343634", "r c #D4DACC", "}. c #FCAA4C", ". c #F4F2EC", "A. c #0C0A0C", "W c #D4DAD4", "$ c #F4F2F4", "( c #949E7C", "c. c #ACAEAC", "=. c #748664", "_ c #BCCAB4", "T c #949E84", "^. c #848284", "<. c #74866C", "m. c #3C3E3C", "Y c #DCE2D4", "&. c #949E8C", "U c #FCFAF4", "s. c #141214", "Q c #DCE2DC", "R c #B4B6AC", "+X c #FCEED4", "I c #FCFAFC", "g c #9CA684", "V. c #B4B6B4", "_. c #FCEEDC", "l c #9CA68C", "J. c #8C8A8C", "8. c #7C8E74", "M. c #444644", "# c #E4EADC", "5. c #9CA694", "Q. c #1C1A1C", "N c #BCBEB4", "+ c #E4EAE4", "/. c #FCE2C4", "2 c #A4AE8C", "R. c #BCBEBC", "*X c #FCD6A4", "7 c #A4AE94", "e. c #949294", "f. c #4C4E4C", "z c #A4AE9C", ",X c #FCCA8C", "t. c #242224", "D c #C4C6BC", "X c #ECF2EC", "0. c #8C9E74", ", c #ACB694", "w. c #C4C6C4", "+. c #8C9E7C", "8 c #ACB69C", "#X c #FCBE74", "z. c #9C9A9C", "j. c #545654", "F c #ACB6A4", "@X c #FCB254", "F. c #2C2A2C", "P c #F4FAF4", "t c #CCCEC4", "*. c #94A67C", "` c #ACB6AC", "=X c #FCB25C", "a c #B4BE9C", "[ c #CCCECC", "$. c #6C7A54", "h c #94A684", "{. c #FCA63C", "> c #B4BEA4", "L. c #A4A2A4", "X. c #6C7A5C", "G c #94A68C", "U. c #5C5E5C", "H c #D4D6C4", "&X c #FCA644", "n c #B4BEAC", "S. c #343234", "V c #D4D6CC", ",. c #B4BEB4", "E c #D4D6D4", "3 c #9CAE8C", ": c #BCC6AC", "x. c #ACAAAC", "-. c #748264", "I. c #646664", "q c #DCDECC", "O. c #949A84", "; c #BCC6B4", "^ c #FCF6EC", "K. c #3C3A3C", "! c #DCDED4", "m c #BCC6BC", ">X c #FCEACC", "~ c #DCDEDC", "< c #A4B694", "OX c #FCEAD4", "K c #C4CEB4", "H. c #B4B2B4", ":. c #7C8A6C", "D. c #6C6E6C", "). c #FCDEB4", "] c #9CA28C", "y c #C4CEBC", "9. c #7C8A74", "n. c #444244", "& c #E4E6DC", ") c #C4CEC4", "s c #E4E6E4", "|. c #FCD29C", " . c #647A54", "C. c #BCBABC", "} c #849274", "Z. c #747674", "A c #A4AA94", "d c #CCD6C4", "#. c #84927C", "XX c #FCC684", "g. c #4C4A4C", "O c #ECEEE4", "h. c #040604", "B c #A4AA9C", ";X c #FCC68C", "o c #ECEEEC", "E. c #8C9A74", "-X c #FCBA6C", "y. c #C4C2C4", "7. c #8C9A7C", "G. c #7C7E7C", "p c #ACB29C", "= c #D4DECC", ".X c #FCAE4C", "o. c #8C9A84", "k. c #545254", "a. c #0C0E0C", "x c #ACB2A4", "w c #D4DED4", "oX c #FCAE54", "% c #F4F6F4", "k c #94A27C", "q. c #CCCACC", "j c #94A284", "T. c #848684", "[. c #FCA23C", "u c #B4BAA4", "3. c #94A28C", "d. c #5C5A5C", "W. c #141614", "C c #DCE6DC", "v c #B4BAAC", /* pixels */ " . . X o O O + @ + # + + @ + O O X o . . ", " X $ O X + O @ + # @ # @ # + O + . X X % ", " . X & + * = - - ; : > > , < 1 2 2 3 4 5 4 4 4 4 5 5 3 2 6 7 , 8 > > ; 9 - 0 q w @ # $ . ", " o X & & e r t y : : u i , p 6 2 3 5 5 4 5 4 5 4 5 4 2 5 6 1 < 8 a > : : - y q = s # X . ", " $ . & & d 0 f f < p g h j k j j l l 3 z x c v u b n b b ; b m b b b M N v u x p 3 B l l j j j j 4 4 8 < : : V d + # ", " . X C & - d M Z 6 < h g k j j j g l A S 8 p > v n b ; b m D ; D ; b N M n u F c A 7 G l j j j j 4 h p 8 f : d H & + ", " % . C J K y i 8 g h j k l l F F L L r r & & o o $ % % % P P I I I I U I I I I I P I P P % % % $ o o & s r r D L 8 F l l j j 4 4 u i - 0 & & ", " . . Y Y y K 8 , g g k T 5 l R F ; D E W Q & o o X $ % % I I P I P I I I P I I % I U % $ X O o & J W r m L F F 5 l j j 4 4 u i - y & & ", " O O d d i i g g j j z c ; m ! ! o o % P I I I % % o o ! ! m m 7 z j h 5 4 > > r r o o ", " + @ 0 d u i g h j j z 7 m L ~ Y o O % % U I I I I I ^ P o O ~ Y D L 7 c j j l 4 > > V e O o ", " + # L K 1 6 j k S 3 m D Y J % . I U I P $ . J Q ; m S 3 j j p < - - @ O ", " & # 9 9 2 2 T k A S D ; J Q X $ P I I I I % $ Q Q D D S A j k , 1 - y + @ ", " @ + 9 9 2 5 j j F 8 d V o X U I U U o X V d x p j j 1 2 y - o O ", " + # 9 9 3 5 k T c F / V o o I I I I o o d V p 8 j j 2 6 t y O o ", " . X - 0 2 2 j ( F F ! W % % I % $ w * F F k j 1 p d e $ % ", " X o - y 1 3 ( j F F w * % $ I I I $ % * w i F j j 1 , d H X . ", " ! ! i i k j c c W r % $ $ % r W c c j h > > & C ", " ! q i i ( k z p r W % . I % $ W r c p j j > > Y & ", " X o K 9 4 h l l ) t X X I I I . X t t 5 l 3 A - - $ . ", " O o 9 _ g g l l ) t X . I I X X t y G l 2 3 y - X . ", " & J i u k j ` i s & I U I I & s F u j j Z M + @ ", " Y Y i i j T i v s s P I P U s s i u h j > f # + ", " r r 2 2 h j ) t $ $ $ $ ) t g j p 6 ! ! ", " e d 2 3 h l y t X $ I X . t y l g 1 1 q ! ", " t y g h 7 A ~ ! I P I P ~ ! 7 7 5 5 d H ", " K y g h B 3 Y ~ U I P I ! ~ 3 7 5 5 d H ", " . X D _ k k F i ' + I I ' + F F g h t y ", " X O : 9 k j F F + + I I + @ F F g h K - ", " X o f f k ( n N X . o ' 0 / N b n N b b V V o X X o n n ] k 9 9 % . ", " o O f Z k k n n o o I ' @ [ 0 N N v n b b { d o . I . X N n h j _ 9 X % ", " X o f Z ( k b b $ % t t } | ... ..... ....... .....X. .o.O.W W I . $ b b h j 9 _ . % ", " o O Z Z j +.b ; X . I I @.@.| #.......$.....$...X.....X. .X.o.o.V W X . ; b k j 9 _ . . ", " . . f f k ( b ; $ % J J D L @.L %.& s s | | ... ...X...X.....X.........$.......$...$...&.&.% % % $ ; b j j K 9 ", " X X Z M k T ; b % $ I I Q Q D D D L Q %.I s & | | ..$...$.................X.........X.........T T $ % $ % b ; *.j 9 y ", " 9 ; k k N M $ % I N N =.-....... .....$...-.-.D D W V ;.X.............X...$...X...$.......X.........X...$... .:.>.' @ % $ b b h k - 0 ", " 9 _ k +.b b % $ I I ,.,.-.-.X...X...$.......<.-.m m I V E X.;...X...X...$.................$.....$...$.........X...>.:.+ ' % . b f j h y - ", " - y k k v v X o I % 1.1...$...............X...$...$...$.o.O.I I J Q ;.;.$...............$...X...$...X.......$.........$.............:.:.% % X $ v n g h r e ", " y t j k n v . $ % % #.1.........$...$...$...............o.O.P I ~ ~ ;.2...X...$...$...X.................X.......X...X.......$...X...:.>.$ % . X u n h g H r ", " r r g h p c o O O.O. . .$...X.............X...$...X...$.....] 3. I I >.:...$.................$...X...$...$.......X...........X...............3.] o o p c 3 5 Y J ", " r r g g c c o o I I T o...$.........X...X...$...............X...3.] ^ P <.>...........X...X...X.................$.........$...$.......X...$...X.3.] I ' O c p 5 2 Y Y ", " & & 2 3 5 l & & I [ t ....X.....$...............$...X...$.........X...4.! I % E V D m V { X $ v ` $.....$...$.............$...X...X...X.......$...........X...$............. .V V s & 5.5 8 i O O ", " & C 1 2 l l & %. 0 t X...........X...$...$...X...........X...$..... .W * % % E V m D 0 / o . ` R ....X.........$...$...$.................X.....X...X...$...........X...$...X./ V I %.& l S , 8 + O ", " . X u u ( +.W r I I 1.#. ...$...X.................$...X...........X...$.&.3. n v X.X.........$...X...z x I I I I 6.;.........X...............X...$...$...$.......$...........$...$...$...........o.o. I I r V j j : : ", " o X a i T j V V I 1.1...X......... ...$...X...X...........$...$.......&.3. v n X.;...$...$..... .X.z z P I I U ;.2.$...$.....$...X...X...$.................X.........$...X...............X...$.7.O. I E r j j : ; ", " t K k +.; ; % % X. .....$...$...X.............$...$...X.........X...-.6. F F $...............$...X.....$.z z / / ..$.........X...............X...$...X...$.......X...........$...X...X...........X...o o % % ; b g j e V ", " K y ( k ; b % P I I .X...X.............X...$...X...............X.......6.-. x x ....X...$...X.........$.....z x { V ........X.........$...X...$.................$.....$...$...X.............$...X.....$.' o % I b ; k h H r ", " J Y 5 4 c 7 o o $ X X.........X...$...............$...X...$.......$... .X.$.% I ! ~ $.................$...X.....| | $ $ U I v v p z ..X.......$...$.............X...$...X...$.......$...........$...X...$.........$.....L L o o z 7 1 6 + @ ", " Y Y 4 5 7 z o o o $ ....$...$.......$...$...X...$...........X...$.......X.X.% % ! ! .. .$...X...$...X...........} | % $ P P v v I c p ....$...$.........X...X...$.................X.........X...X...............X.........L @. o o 1 z 6 7 # + ", " . . > > k T w ! I I % ..........$...................X...$...........X...$.X.;.I 5.5...X...............$...X.| 8.$ X P ^ o.o.$...] ] I O.o...........X...X.............X...$...X...$.......X...........$...$...X...$.....X...X.F R I * w j j : : ", " X X u i j ( w * I % I ..$...X.....X...X...X...X...$.........$...X.........;.X. I 5.5.......X...$...X.........8.| % $ % I o.o.....3.3.I I o.o.X...X...$.........$...$...$.................X.....$...$...X.................$.......F v I w * j j : ; ", " H d k k ,.N % % -.<...........................X...X.........$...$...| | >.<.$...............$...} | % . P I o.1...$...X...X.&.] | 8...........X...$.............X...$...X...$.......$...........$...X...$.....X.....$...R F ^ % b n g g ! ! ", " d d k k N M % U >.-.$...X...$...$...$...$...$.........X...$.........8.#. <.>.....$...$...X.......| | . $ % ^ o.o.............] 3.I | 9.$...X...$.........X...X...$.................X.........X...X...........X.............F R P % n n g h = ! ", " o O 1 1 l 3.# s x x ..........................$...$.........X...$...N n :.>...............X.1.1.X % P I o.o...$...X...X.......X.&.] 1.1...........$...X.............X...$...X...$.......X...........$...X.........$...X...X.F ` @ + l l i > X . ", " O + p 1 g l + s c x ....$...X...X...X...X...X.........X...$.........n N :.:...X...X...X.....1.#.$ $ I P 7.o...............X.....] 3.I #.1.....$...X.........$...X...$.................$.....X...$...$.........$...X...........F R s s l G > i . $ ", " t K k 0.L D I U $ X 6.2.......................$...X.........X...<.-.I % ] &.............1.1.% % I % o.1...$...X...$.....$...........] ] I 5.5...$.........$...............X...$...X...X.......$...........X...$.........$...$...$.,.N I P L L k *.r e q.q.w.q.{ [ ", " y y ( +.L L P I . X -.2.$...$...$...$...$...$...........$.......>.-.% I &.3...$...$...$.#.1.% I % I 7.o.X...........$.......X...X...] 3.I I l 5.........$.....X...$...X...$.................X.........X...$.........$...X...........n N U I L L j k r r w.w.q.w.[ { ", " O O 6 6 l 5 ' + V V X.X...................X...$...X.....6.X.! ! V / $.......1.#.P % I % o.1.........$...X.......X...............O.+.I I D m $...X.......$...............X...$...$...$.......X...........X...X.........$...X...$.~ ~ ' + 5 l i i . X e.e.r.r.r.r.t.t. ... [truncated message content] |
|
From: Markus R. <rol...@us...> - 2007-02-18 13:51:05
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21147 Modified Files: Tag: WIN32 constants.h main.cpp main.h Log Message: - add a simple splash screen Index: main.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/main.cpp,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** main.cpp 15 Feb 2007 10:58:39 -0000 1.6.2.2 --- main.cpp 18 Feb 2007 13:50:50 -0000 1.6.2.3 *************** *** 27,30 **** --- 27,31 ---- // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" + #include <wx/splash.h> #ifdef __BORLANDC__ *************** *** 45,48 **** --- 46,51 ---- #include "property.h" + #include <rsgedit/res/xpm_sparklogo.xpm> + IMPLEMENT_APP(RsgEditApp) *************** *** 51,54 **** --- 54,66 ---- bool RsgEditApp::OnInit() { + wxSplashScreen* splash = new wxSplashScreen + ( + wxBitmap(xpm_sparklogo), + wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT, + 0, NULL, -1, wxDefaultPosition, wxDefaultSize, + wxSIMPLE_BORDER|wxSTAY_ON_TOP + ); + wxYield(); + mSpark = shared_ptr<SimSpark>(new SimSpark("../../")); *************** *** 63,66 **** --- 75,79 ---- #ifdef __WXMSW__ frame->SetIcon(wxIcon("Spark", wxBITMAP_TYPE_ICO_RESOURCE)); + ::wxHandleFatalExceptions(true); #endif *************** *** 69,72 **** --- 82,90 ---- SetTopWindow(frame); + splash->Destroy(); + + #ifdef __WXMSW__ + frame->Raise(); + #endif return true; } *************** *** 81,82 **** --- 99,104 ---- return mProperty; } + + void RsgEditApp::OnFatalException() + { + } Index: constants.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/constants.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** constants.h 18 Feb 2007 09:12:42 -0000 1.1.2.3 --- constants.h 18 Feb 2007 13:50:48 -0000 1.1.2.4 *************** *** 37,41 **** ID_FILE_OPEN = (wxID_HIGHEST+23), ! ID_FILE_RELOAD = (wxID_HIGHEST+24) }; --- 37,43 ---- ID_FILE_OPEN = (wxID_HIGHEST+23), ! ID_FILE_RELOAD = (wxID_HIGHEST+24), ! ! ID_HELP_ABOUT = (wxID_HIGHEST+25) }; Index: main.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/main.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** main.h 10 Feb 2007 19:01:53 -0000 1.2.2.1 --- main.h 18 Feb 2007 13:50:50 -0000 1.2.2.2 *************** *** 40,43 **** --- 40,46 ---- protected: + void OnFatalException(); + + protected: boost::shared_ptr<SimSpark> mSpark; boost::shared_ptr<Property> mProperty; |
|
From: Markus R. <rol...@us...> - 2007-02-18 13:21:15
|
Update of /cvsroot/simspark/simspark/simulations/parts/rsg/agent In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7444/agent Modified Files: Tag: WIN32 ball.rsg soccer.rsg Log Message: - sync with rcssserver3d CVS Index: ball.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/agent/ball.rsg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** ball.rsg 24 Feb 2006 10:40:41 -0000 1.1 --- ball.rsg 18 Feb 2007 13:21:01 -0000 1.1.2.1 *************** *** 8,12 **** (node Ball ! (setLocalPos 0 0 0.5) (setName Ball) --- 8,12 ---- (node Ball ! (setLocalPos 5.0 0.0 0.5) (setName Ball) *************** *** 29,32 **** --- 29,36 ---- (setRadius $Radius) + (node RecorderHandler + (setName recorder) + ) + (node ContactJointHandler (setContactBounceMode false) Index: soccer.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/agent/soccer.rsg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** soccer.rsg 24 Feb 2006 10:40:41 -0000 1.1 --- soccer.rsg 18 Feb 2007 13:21:01 -0000 1.1.2.1 *************** *** 89,96 **** (node ContactJointHandler (setContactBounceMode false) ) ) ) ! ; create the left goal (node Transform --- 89,115 ---- (node ContactJointHandler (setContactBounceMode false) + + (setContactSlipMode true) + (setContactSlip 0.1 0.1) + + (setContactSoftERPMode true) + (setContactSoftERP 0.2) + + (setContactSoftCFM true) + (setContactSoftCFM 0.01) ) ) ) ! ! ; create box collider around playing field ! (node BoxCollider ! (setName FieldBox) ! (setPosition 0 0 20) ! (setBoxLengths $FieldLength $FieldWidth 40) ! (node RecorderHandler ! (setName recorder) ! ) ! ) ! ; create the left goal (node Transform |
|
From: Markus R. <rol...@us...> - 2007-02-18 13:21:11
|
Update of /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7444/boxspheres Modified Files: Tag: WIN32 box.rsg sphere.rsg Log Message: - sync with rcssserver3d CVS Index: box.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres/box.rsg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** box.rsg 24 Feb 2006 12:04:14 -0000 1.1 --- box.rsg 18 Feb 2007 13:21:02 -0000 1.1.2.1 *************** *** 27,34 **** (setContactSoftERPMode true) ! (setContactSoftERP 0.5) (setContactSoftCFM true) ! (setContactSoftCFM 0.3) ) --- 27,34 ---- (setContactSoftERPMode true) ! (setContactSoftERP 0.2) (setContactSoftCFM true) ! (setContactSoftCFM 0.01) ) Index: sphere.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres/sphere.rsg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** sphere.rsg 24 Feb 2006 12:04:14 -0000 1.1 --- sphere.rsg 18 Feb 2007 13:21:02 -0000 1.1.2.1 *************** *** 14,20 **** (setSphere $density $radius) (node DragController ! (setAngularDrag 0.01) (setLinearDrag 0.01) ! ) ) --- 14,20 ---- (setSphere $density $radius) (node DragController ! (setAngularDrag 0.01) (setLinearDrag 0.01) ! ) ) *************** *** 29,36 **** (setContactSoftERPMode true) ! (setContactSoftERP 0.5) (setContactSoftCFM true) ! (setContactSoftCFM 0.3) ) ) --- 29,36 ---- (setContactSoftERPMode true) ! (setContactSoftERP 0.2) (setContactSoftCFM true) ! (setContactSoftCFM 0.01) ) ) |
|
From: Markus R. <rol...@us...> - 2007-02-18 13:17:08
|
Update of /cvsroot/simspark/simspark/spark/win32 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6008 Modified Files: Tag: WIN32 simspark.iss Log Message: - add soccer and sparkagent bundle to setup Index: simspark.iss =================================================================== RCS file: /cvsroot/simspark/simspark/spark/win32/Attic/simspark.iss,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** simspark.iss 15 Feb 2007 21:14:44 -0000 1.1.2.3 --- simspark.iss 18 Feb 2007 13:16:59 -0000 1.1.2.4 *************** *** 50,53 **** --- 50,55 ---- Source: {#MyVcReleaseDir}\sexpparser.dll; DestDir: {app}; Flags: ignoreversion Source: {#MyVcReleaseDir}\filesystemstd.dll; DestDir: {app}; Flags: ignoreversion + Source: {#MyVcReleaseDir}\soccer.dll; DestDir: {app}; Flags: ignoreversion + Source: {#MyVcReleaseDir}\sparkagent.dll; DestDir: {app}; Flags: ignoreversion ; ruby scripts |
|
From: Markus R. <rol...@us...> - 2007-02-18 13:17:07
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6000 Modified Files: Tag: WIN32 rsgedit.rb Log Message: - define matlightblue material Index: rsgedit.rb =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.rb,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** rsgedit.rb 15 Feb 2007 21:09:58 -0000 1.4.2.2 --- rsgedit.rb 18 Feb 2007 13:16:59 -0000 1.4.2.3 *************** *** 44,47 **** --- 44,50 ---- material.setDiffuse(0.0,0.0,1.0,1.0) + material = new('kerosin/MaterialSolid', $serverPath+'material/matLightBlue'); + material.setDiffuse(0.0,0.75,1.0,1.0) + material = new('kerosin/MaterialSolid', $serverPath+'material/matWhite'); material.setDiffuse(1.0,1.0,1.0,1.0) *************** *** 61,63 **** material.setDiffuse(0.1,0.1,0.1,1.0) - --- 64,65 ---- |
|
From: Markus R. <rol...@us...> - 2007-02-18 13:08:33
|
Update of /cvsroot/simspark/simspark/spark/plugin/sparkagent In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3044 Modified Files: Tag: WIN32 sparkagent.vcproj Log Message: - fix release build Index: sparkagent.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/Attic/sparkagent.vcproj,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** sparkagent.vcproj 18 Feb 2007 12:06:36 -0000 1.1.2.1 --- sparkagent.vcproj 18 Feb 2007 13:08:29 -0000 1.1.2.2 *************** *** 137,141 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 137,141 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="msvcrt-ruby18.lib ode.lib" LinkIncremental="1" GenerateDebugInformation="true" |
