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-10 16:19:25
|
Update of /cvsroot/simspark/simspark/spark/kerosin/textureserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22233 Modified Files: Tag: WIN32 textureserver.cpp Log Message: - make ImageServer usage a noop for win32 build (this needs to be made optional in a sane way) Index: textureserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/textureserver/textureserver.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** textureserver.cpp 5 Dec 2005 21:38:23 -0000 1.1 --- textureserver.cpp 10 Feb 2007 16:19:21 -0000 1.1.2.1 *************** *** 24,30 **** #include <zeitgeist/logserver/logserver.h> #include "../openglserver/openglserver.h" - #include "../imageserver/imageserver.h" #include "texture2d.h" using namespace boost; using namespace kerosin; --- 24,33 ---- #include <zeitgeist/logserver/logserver.h> #include "../openglserver/openglserver.h" #include "texture2d.h" + #ifndef WIN32 + #include "../imageserver/imageserver.h" + #endif + using namespace boost; using namespace kerosin; *************** *** 52,57 **** --- 55,64 ---- // setup ImageServer reference + #ifdef WIN32 + mImageServer.reset(); + #else mImageServer = shared_dynamic_cast<ImageServer> (GetCore()->Get("sys/server/image")); + #endif if (mImageServer.get() == 0) *************** *** 88,91 **** --- 95,101 ---- } + #ifdef WIN32 + return shared_ptr<Texture>(); + #else // no match for that name, so we have to load it shared_ptr<Image> image = mImageServer->Load(name.c_str()); *************** *** 105,107 **** --- 115,118 ---- return texture; + #endif } |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:18:36
|
Update of /cvsroot/simspark/simspark/spark/kerosin/sceneserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21823 Modified Files: Tag: WIN32 light.cpp Log Message: - compilation fix Index: light.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/light.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** light.cpp 5 Dec 2005 21:38:23 -0000 1.1 --- light.cpp 10 Feb 2007 16:18:24 -0000 1.1.2.1 *************** *** 159,163 **** void Light::FlushCache() { ! const unsigned int n = mCachedIndices.size(); for (unsigned int i=0; i<n; ++i) { --- 159,165 ---- void Light::FlushCache() { ! const unsigned int n ! = static_cast<unsigned int>(mCachedIndices.size()); ! for (unsigned int i=0; i<n; ++i) { |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:18:06
|
Update of /cvsroot/simspark/simspark/spark/kerosin/materialserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21428 Modified Files: Tag: WIN32 material2dtexture.cpp Log Message: - lookup glActiveTextureARB extension via the OpenGLServer Index: material2dtexture.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/material2dtexture.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** material2dtexture.cpp 5 Dec 2005 21:38:22 -0000 1.1 --- material2dtexture.cpp 10 Feb 2007 16:18:00 -0000 1.1.2.1 *************** *** 80,84 **** if (mTexDiffuse.get() != 0) { ! glActiveTextureARB(GL_TEXTURE0_ARB); glEnable(GL_TEXTURE_2D); mTexDiffuse->Bind(); --- 80,84 ---- if (mTexDiffuse.get() != 0) { ! OpenGLServer::glActiveTextureARB(GL_TEXTURE0_ARB); glEnable(GL_TEXTURE_2D); mTexDiffuse->Bind(); *************** *** 87,91 **** if (mTexNormal.get() != 0) { ! glActiveTextureARB(GL_TEXTURE1_ARB); glEnable(GL_TEXTURE_2D); mTexNormal->Bind(); --- 87,91 ---- if (mTexNormal.get() != 0) { ! OpenGLServer::glActiveTextureARB(GL_TEXTURE1_ARB); glEnable(GL_TEXTURE_2D); mTexNormal->Bind(); *************** *** 94,98 **** if (mTexSpecular.get() != 0) { ! glActiveTextureARB(GL_TEXTURE2_ARB); glEnable(GL_TEXTURE_2D); mTexSpecular->Bind(); --- 94,98 ---- if (mTexSpecular.get() != 0) { ! OpenGLServer::glActiveTextureARB(GL_TEXTURE2_ARB); glEnable(GL_TEXTURE_2D); mTexSpecular->Bind(); |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:17:33
|
Update of /cvsroot/simspark/simspark/spark/kerosin/openglserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21404 Modified Files: Tag: WIN32 openglserver.cpp openglserver.h Log Message: - remove dependency from OpenGLServer on auto generated gl extension reg. Currently only one extension is used (glActiveTextureARB). For this extension a static method is provided Index: openglserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/openglserver/openglserver.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** openglserver.cpp 5 Dec 2005 21:38:23 -0000 1.1 --- openglserver.cpp 10 Feb 2007 16:17:28 -0000 1.1.2.1 *************** *** 48,53 **** using namespace zeitgeist; ! OpenGLServer::OpenGLServer() : Leaf(), mExtensionReg(new GLExtensionReg()), ! mWantsToQuit(false), mHolder( new MapHolder() ) { } --- 48,52 ---- using namespace zeitgeist; ! OpenGLServer::OpenGLServer() : Leaf(), mWantsToQuit(false), mHolder( new MapHolder() ) { } *************** *** 57,65 **** } - boost::shared_ptr<GLExtensionReg> OpenGLServer::GetExtensionReg() const - { - return mExtensionReg; - } - void OpenGLServer::Quit() { --- 56,59 ---- *************** *** 155,176 **** unsigned int OpenGLServer::LoadARBVertexProgram(const char* fileName) { ! // only try to load stuff if the extension is supported ! if (!mExtensionReg->Has_GL_ARB_vertex_program()) ! { ! return 0; ! } ! ! return LoadARBProgram(GL_VERTEX_PROGRAM_ARB, fileName); } unsigned int OpenGLServer::LoadARBFragmentProgram(const char* /*fileName*/) { - // only try to load stuff if the extension is supported - // if (!mExtensionReg->Has_GL_ARB_fragment_program()) - // { - // return 0; - // } - - // return LoadARBProgram(GL_FRAGMENT_PROGRAM_ARB, fileName); return 0; } --- 149,157 ---- unsigned int OpenGLServer::LoadARBVertexProgram(const char* fileName) { ! return 0; } unsigned int OpenGLServer::LoadARBFragmentProgram(const char* /*fileName*/) { return 0; } *************** *** 203,212 **** } - mExtensionReg->Init(); - - // if (!mExtensionReg->Has_GL_ARB_vertex_program() || !mExtensionReg->Has_GL_ARB_fragment_program()) - // { - // GetLog()->Normal() << "WARNING: GL_ARB_vertex_program not supported. " - // << "disabling fancy lighting\n" << endl; mSupportsFancyLighting = false; --- 184,187 ---- *************** *** 258,260 **** --- 233,257 ---- } + void* OpenGLServer::GetExtension(const char* name) + { + #ifdef WIN32 + return wglGetProcAddress(name); + #else + return glXGetProcAddressARB((unsigned char*)name); + #endif + } + #define PROC_ADDRESS(_ptr, _function)\ + static _ptr proc = (_ptr) GetExtension(#_function); + + void OpenGLServer::glActiveTextureARB(GLenum texture) + { + PROC_ADDRESS(PFNGLACTIVETEXTUREARBPROC, "glActiveTextureARB"); + + if (! proc) + { + return; + } + + (proc)(texture); + } Index: openglserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/openglserver/openglserver.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** openglserver.h 5 Dec 2005 21:38:23 -0000 1.1 --- openglserver.h 10 Feb 2007 16:17:28 -0000 1.1.2.1 *************** *** 27,31 **** #include <zeitgeist/class.h> #include <zeitgeist/leaf.h> ! #include "glextensionreg.h" namespace kerosin --- 27,47 ---- #include <zeitgeist/class.h> #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 *************** *** 68,73 **** bool Init(const std::string& openGLSysName); - boost::shared_ptr<GLExtensionReg> GetExtensionReg() const; - //! if this is called, the application will 'want to quit' void Quit(); --- 84,87 ---- *************** *** 102,105 **** --- 116,125 ---- void PutLight(int l); + /** returns the address of an OpenGL extension by name */ + static void* GetExtension(const char* name); + + /** looksup and calls glActiveTextureARB extension if available */ + static void glActiveTextureARB(GLenum texture); + protected: //! set up opengl viewport *************** *** 110,116 **** // protected: - //! this contains information on all available extensions - boost::shared_ptr<GLExtensionReg> mExtensionReg; - //! a flag, which can be used to control the shutdown of the display window and the application bool mWantsToQuit; --- 130,133 ---- |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:15:41
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20594 Modified Files: Tag: WIN32 kerosin.cpp kerosin.h Log Message: - remove sound- font- and imageserver from win32 build. This needs to be made optional in a sane way Index: kerosin.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** kerosin.h 5 Dec 2005 21:38:22 -0000 1.1 --- kerosin.h 10 Feb 2007 16:15:38 -0000 1.1.2.1 *************** *** 30,34 **** --- 30,40 ---- #define KEROSIN_KEROSIN_H + #ifndef WIN32 #include "soundserver/soundserver.h" + #include "imageserver/imageserver.h" + #include "fontserver/fontserver.h" + #include "fontserver/font.h" + #endif + #include "inputserver/inputserver.h" #include "inputserver/inputsystem.h" *************** *** 36,42 **** #include "inputserver/inputcontrol.h" #include "inputserver/inputitem.h" ! #include "imageserver/imageserver.h" ! #include "fontserver/fontserver.h" ! #include "fontserver/font.h" #include "openglserver/openglserver.h" #include "openglserver/openglsystem.h" --- 42,46 ---- #include "inputserver/inputcontrol.h" #include "inputserver/inputitem.h" ! #include "openglserver/openglserver.h" #include "openglserver/openglsystem.h" Index: kerosin.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** kerosin.cpp 5 Dec 2005 21:38:22 -0000 1.1 --- kerosin.cpp 10 Feb 2007 16:15:38 -0000 1.1.2.1 *************** *** 28,32 **** --- 28,37 ---- Kerosin::Kerosin(zeitgeist::Zeitgeist &zg) { + #ifndef WIN32 zg.GetCore()->RegisterClassObject(new CLASS(SoundServer), "kerosin/"); + zg.GetCore()->RegisterClassObject(new CLASS(ImageServer), "kerosin/"); + zg.GetCore()->RegisterClassObject(new CLASS(FontServer), "kerosin/"); + #endif + zg.GetCore()->RegisterClassObject(new CLASS(InputServer), "kerosin/"); zg.GetCore()->RegisterClassObject(new CLASS(InputSystem), "kerosin/"); *************** *** 34,39 **** zg.GetCore()->RegisterClassObject(new CLASS(InputDevice), "kerosin/"); zg.GetCore()->RegisterClassObject(new CLASS(InputControl), "kerosin/"); ! zg.GetCore()->RegisterClassObject(new CLASS(ImageServer), "kerosin/"); ! zg.GetCore()->RegisterClassObject(new CLASS(FontServer), "kerosin/"); zg.GetCore()->RegisterClassObject(new CLASS(OpenGLServer), "kerosin/"); zg.GetCore()->RegisterClassObject(new CLASS(OpenGLSystem), "kerosin/"); --- 39,43 ---- zg.GetCore()->RegisterClassObject(new CLASS(InputDevice), "kerosin/"); zg.GetCore()->RegisterClassObject(new CLASS(InputControl), "kerosin/"); ! zg.GetCore()->RegisterClassObject(new CLASS(OpenGLServer), "kerosin/"); zg.GetCore()->RegisterClassObject(new CLASS(OpenGLSystem), "kerosin/"); |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:15:06
|
Update of /cvsroot/simspark/simspark/spark/kerosin/inputserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20202 Modified Files: Tag: WIN32 inputcontrol.cpp inputserver.cpp Log Message: - compilation fixes Index: inputcontrol.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** inputcontrol.cpp 25 Dec 2005 18:32:27 -0000 1.2 --- inputcontrol.cpp 10 Feb 2007 16:14:50 -0000 1.2.2.1 *************** *** 34,39 **** { mDeltaTime = 0; ! mHorSens = 0.3; ! mVertSens = 0.3; mAdvanceTime = true; mMouseLook = false; --- 34,39 ---- { mDeltaTime = 0; ! mHorSens = 0.3f; ! mVertSens = 0.3f; mAdvanceTime = true; mMouseLook = false; Index: inputserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputserver.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** inputserver.cpp 25 Dec 2005 18:32:27 -0000 1.2 --- inputserver.cpp 10 Feb 2007 16:14:50 -0000 1.2.2.1 *************** *** 34,38 **** InputServer::InputServer() : ! Node(), mModifierState(Input::Input::eNone), mScanCodeMap(new ScanCodeMap()) { // default to a german keyboard layout --- 34,38 ---- InputServer::InputServer() : ! Node(), mModifierState(Input::eUnknown), mScanCodeMap(new ScanCodeMap()) { // default to a german keyboard layout |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:14:02
|
Update of /cvsroot/simspark/simspark/spark/plugin/filesystemstd In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19793 Added Files: Tag: WIN32 filesystemstd.vcproj Log Message: --- NEW FILE: filesystemstd.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="filesystemstd" ProjectGUID="{4A4E1738-60BC-4BB4-AFC8-92320D769D90}" RootNamespace="filesystemstd" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <File RelativePath=".\export.cpp" > </File> <File RelativePath=".\filesystemstd.cpp" > </File> <File RelativePath=".\filesystemstd.h" > </File> <File RelativePath=".\filesystemstd_c.cpp" > </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:13:50
|
Update of /cvsroot/simspark/simspark/spark/utility In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19776/utility Modified Files: Tag: WIN32 utility.vcproj Log Message: Index: utility.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/Attic/utility.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 *** utility.vcproj 9 Feb 2007 16:22:26 -0000 1.1.2.1 --- utility.vcproj 10 Feb 2007 16:13:46 -0000 1.1.2.2 *************** *** 327,330 **** --- 327,334 ---- </File> </Filter> + <File + RelativePath="..\win32\config.h" + > + </File> </Files> <Globals> |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:13:50
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19776/kerosin Added Files: Tag: WIN32 kerosin.vcproj Log Message: --- NEW FILE: kerosin.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="kerosin" ProjectGUID="{38291F56-23B6-4B5D-8810-D2AD2A379EE9}" RootNamespace="kerosin" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="materialserver" > <File RelativePath=".\materialserver\material.cpp" > </File> <File RelativePath=".\materialserver\material.h" > </File> <File RelativePath=".\materialserver\material2dtexture.cpp" > </File> <File RelativePath=".\materialserver\material2dtexture.h" > </File> <File RelativePath=".\materialserver\material2dtexture_c.cpp" > </File> <File RelativePath=".\materialserver\material_c.cpp" > </File> <File RelativePath=".\materialserver\materialserver.cpp" > </File> <File RelativePath=".\materialserver\materialserver.h" > </File> <File RelativePath=".\materialserver\materialserver_c.cpp" > </File> <File RelativePath=".\materialserver\materialsolid.cpp" > </File> <File RelativePath=".\materialserver\materialsolid.h" > </File> <File RelativePath=".\materialserver\materialsolid_c.cpp" > </File> </Filter> <Filter Name="openglserver" > <File RelativePath=".\openglserver\glbase.h" > </File> <File RelativePath=".\openglserver\openglserver.cpp" > </File> <File RelativePath=".\openglserver\openglserver.h" > </File> <File RelativePath=".\openglserver\openglserver_c.cpp" > </File> <File RelativePath=".\openglserver\openglsystem.h" > </File> <File RelativePath=".\openglserver\openglsystem_c.cpp" > </File> </Filter> <Filter Name="inputserver" > <File RelativePath=".\inputserver\input.cpp" > </File> <File RelativePath=".\inputserver\input.h" > </File> <File RelativePath=".\inputserver\inputcontrol.cpp" > </File> <File RelativePath=".\inputserver\inputcontrol.h" > </File> <File RelativePath=".\inputserver\inputcontrol_c.cpp" > </File> <File RelativePath=".\inputserver\inputdevice.cpp" > </File> <File RelativePath=".\inputserver\inputdevice.h" > </File> <File RelativePath=".\inputserver\inputdevice_c.cpp" > </File> <File RelativePath=".\inputserver\inputitem.cpp" > </File> <File RelativePath=".\inputserver\inputitem.h" > </File> <File RelativePath=".\inputserver\inputitem_c.cpp" > </File> <File RelativePath=".\inputserver\inputserver.cpp" > </File> <File RelativePath=".\inputserver\inputserver.h" > </File> <File RelativePath=".\inputserver\inputserver_c.cpp" > </File> <File RelativePath=".\inputserver\inputsystem.cpp" > </File> <File RelativePath=".\inputserver\inputsystem.h" > </File> <File RelativePath=".\inputserver\inputsystem_c.cpp" > </File> <File RelativePath=".\inputserver\scancodemap.cpp" > </File> <File RelativePath=".\inputserver\scancodemap.h" > </File> </Filter> <Filter Name="renderserver" > <File RelativePath=".\renderserver\customrender.cpp" > </File> <File RelativePath=".\renderserver\customrender.h" > </File> <File RelativePath=".\renderserver\customrender_c.cpp" > </File> <File RelativePath=".\renderserver\rendercontrol.cpp" > </File> <File RelativePath=".\renderserver\rendercontrol.h" > </File> <File RelativePath=".\renderserver\rendercontrol_c.cpp" > </File> <File RelativePath=".\renderserver\rendernode.cpp" > </File> <File RelativePath=".\renderserver\rendernode.h" > </File> <File RelativePath=".\renderserver\rendernode_c.cpp" > </File> <File RelativePath=".\renderserver\renderserver.cpp" > </File> <File RelativePath=".\renderserver\renderserver.h" > </File> <File RelativePath=".\renderserver\renderserver_c.cpp" > </File> </Filter> <Filter Name="sceneserver" > <File RelativePath=".\sceneserver\axis.cpp" > </File> <File RelativePath=".\sceneserver\axis.h" > </File> <File RelativePath=".\sceneserver\axis_c.cpp" > </File> <File RelativePath=".\sceneserver\box.cpp" > </File> <File RelativePath=".\sceneserver\box.h" > </File> <File RelativePath=".\sceneserver\box_c.cpp" > </File> <File RelativePath=".\sceneserver\ccylinder.cpp" > </File> <File RelativePath=".\sceneserver\ccylinder.h" > </File> <File RelativePath=".\sceneserver\ccylinder_c.cpp" > </File> <File RelativePath=".\sceneserver\light.cpp" > </File> <File RelativePath=".\sceneserver\light.h" > </File> <File RelativePath=".\sceneserver\light_c.cpp" > </File> <File RelativePath=".\sceneserver\singlematnode.cpp" > </File> <File RelativePath=".\sceneserver\singlematnode.h" > </File> <File RelativePath=".\sceneserver\singlematnode_c.cpp" > </File> <File RelativePath=".\sceneserver\sphere.cpp" > </File> <File RelativePath=".\sceneserver\sphere.h" > </File> <File RelativePath=".\sceneserver\sphere_c.cpp" > </File> <File RelativePath=".\sceneserver\staticmesh.cpp" > </File> <File RelativePath=".\sceneserver\staticmesh.h" > </File> <File RelativePath=".\sceneserver\staticmesh_c.cpp" > </File> <Filter Name="helper" > <File RelativePath=".\sceneserver\helper\nv_algebra.cpp" > </File> <File RelativePath=".\sceneserver\helper\NVMeshMender.cpp" > </File> <File RelativePath=".\sceneserver\helper\NVMeshMender.h" > </File> <Filter Name="nv_math" > <File RelativePath=".\sceneserver\helper\nv_math\nv_algebra.h" > </File> <File RelativePath=".\sceneserver\helper\nv_math\nv_math.h" > </File> <File RelativePath=".\sceneserver\helper\nv_math\nv_mathdecl.h" > </File> </Filter> </Filter> </Filter> <Filter Name="textureserver" > <File RelativePath=".\textureserver\texture.cpp" > </File> <File RelativePath=".\textureserver\texture.h" > </File> <File RelativePath=".\textureserver\texture2d.cpp" > </File> <File RelativePath=".\textureserver\texture2d.h" > </File> <File RelativePath=".\textureserver\textureserver.cpp" > </File> <File RelativePath=".\textureserver\textureserver.h" > </File> <File RelativePath=".\textureserver\textureserver_c.cpp" > </File> </Filter> <File RelativePath=".\kerosin.cpp" > </File> <File RelativePath=".\kerosin.h" > </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Markus R. <rol...@us...> - 2007-02-10 16:13:43
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19759 Modified Files: Tag: WIN32 coretest.vcproj Log Message: Index: coretest.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/test/coretest/Attic/coretest.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** coretest.vcproj 9 Feb 2007 20:12:16 -0000 1.1.2.2 --- coretest.vcproj 10 Feb 2007 16:13:37 -0000 1.1.2.3 *************** *** 62,66 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\debugdll\ode.lib wsock32.lib" LinkIncremental="2" AdditionalLibraryDirectories="" --- 62,66 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\debugdll\ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="2" AdditionalLibraryDirectories="" |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:43
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10880 Modified Files: Tag: WIN32 rubywrapper.h Log Message: Index: rubywrapper.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/rubywrapper.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 *** rubywrapper.h 9 Feb 2007 16:17:22 -0000 1.1.2.1 --- rubywrapper.h 9 Feb 2007 20:12:32 -0000 1.1.2.2 *************** *** 38,42 **** --- 38,59 ---- #define EXTERN extern __declspec(dllimport) #endif + + #ifdef WIN32 + #include <winsock2.h> + #endif + #include <ruby.h> + + #ifdef WIN32 + #undef bind + #undef listen + #undef accept + #undef connect + #undef close + #undef recv + #undef socket + #undef send + #endif + #undef EXTERN |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:26
|
Update of /cvsroot/simspark/simspark/spark/utility/rcssnet In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10831 Added Files: Tag: WIN32 handler.cpp handler.hpp rcssnet.vcproj Log Message: --- NEW FILE: rcssnet.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="rcssnet" ProjectGUID="{ABCC65CE-0762-42F2-8459-41722DCF02D9}" RootNamespace="rcssnet" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\win32" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <File RelativePath=".\addr.cpp" > </File> <File RelativePath=".\addr.hpp" > </File> <File RelativePath=".\exception.cpp" > </File> <File RelativePath=".\exception.hpp" > </File> <File RelativePath=".\handler.cpp" > </File> <File RelativePath=".\handler.hpp" > </File> <File RelativePath=".\iosocketstream.hpp" > </File> <File RelativePath=".\isocketstream.hpp" > </File> <File RelativePath=".\osocketstream.hpp" > </File> <File RelativePath=".\socket.cpp" > </File> <File RelativePath=".\socket.hpp" > </File> <File RelativePath=".\socketstreambuf.hpp" > </File> <File RelativePath=".\tcpsocket.cpp" > </File> <File RelativePath=".\tcpsocket.hpp" > </File> <File RelativePath=".\udpsocket.cpp" > </File> <File RelativePath=".\udpsocket.hpp" > </File> </Files> <Globals> </Globals> </VisualStudioProject> --- NEW FILE: handler.hpp --- // -*-c++-*- /*************************************************************************** handler.hpp - handles network startup ------------------- begin : 14-AUG-2003 copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU LGPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #ifndef RCSS_NET_HANDLER_HPP #define RCSS_NET_HANDLER_HPP #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) #include "Winsock2.h" #endif namespace rcss { namespace net { class Handler { public: static Handler& instance(); bool valid() const { return m_valid; } private: Handler(); Handler( const Handler& ); // not used Handler& operator=( const Handler& ); // not used ~Handler(); #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) WSADATA m_WSAData; #endif bool m_valid; }; } } #endif // RCSS_NET_HANDLER_HPP --- NEW FILE: handler.cpp --- // -*-c++-*- /*************************************************************************** handler.cpp - handles network startup ------------------- begin : 14-AUG-2003 copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU LGPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #include "handler.hpp" namespace rcss { namespace net { Handler& Handler::instance() { static Handler rval; return rval; } Handler::Handler() : m_valid( true ) { #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) WORD wVersionRequested; int err; wVersionRequested = MAKEWORD( 2, 2 ); err = WSAStartup( wVersionRequested, &m_WSAData ); if ( err != 0 ) { m_valid = false; return; } if ( LOBYTE( m_WSAData.wVersion ) != 2 || HIBYTE( m_WSAData.wVersion ) != 2 ) { WSACleanup(); m_valid = false; return; } #endif } Handler::~Handler() { #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) WSACleanup(); #endif } } } |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:21
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10818 Modified Files: Tag: WIN32 coretest.vcproj Log Message: Index: coretest.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/test/coretest/Attic/coretest.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 *** coretest.vcproj 9 Feb 2007 16:23:11 -0000 1.1.2.1 --- coretest.vcproj 9 Feb 2007 20:12:16 -0000 1.1.2.2 *************** *** 41,46 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;"C:\ruby\lib\ruby\1.8\i386-mswin32"" ! PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" --- 41,46 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" ! PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" *************** *** 62,66 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib wsock32.lib" LinkIncremental="2" AdditionalLibraryDirectories="" --- 62,66 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\debugdll\ode.lib wsock32.lib" LinkIncremental="2" AdditionalLibraryDirectories="" *************** *** 120,124 **** Name="VCCLCompilerTool" AdditionalIncludeDirectories="C:\develop\x\simspark\spark" ! PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" UsePrecompiledHeader="0" --- 120,124 ---- Name="VCCLCompilerTool" AdditionalIncludeDirectories="C:\develop\x\simspark\spark" ! PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:17
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10736/zeitgeist Modified Files: Tag: WIN32 zeitgeist.vcproj Log Message: Index: zeitgeist.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/Attic/zeitgeist.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 *** zeitgeist.vcproj 9 Feb 2007 16:22:53 -0000 1.1.2.1 --- zeitgeist.vcproj 9 Feb 2007 20:12:08 -0000 1.1.2.2 *************** *** 41,45 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""C:\ruby\lib\ruby\1.8\i386-mswin32";..\" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" --- 41,45 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="..\win32;..\;"C:\ruby\lib\ruby\1.8\i386-mswin32"" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" *************** *** 104,108 **** <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" --- 104,108 ---- <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:11
|
Update of /cvsroot/simspark/simspark/spark/salt In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10736/salt Modified Files: Tag: WIN32 gmath.h salt.vcproj Log Message: Index: salt.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/salt/Attic/salt.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 *** salt.vcproj 9 Feb 2007 16:22:24 -0000 1.1.2.1 --- salt.vcproj 9 Feb 2007 20:12:08 -0000 1.1.2.2 *************** *** 103,107 **** <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" --- 103,107 ---- <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" Index: gmath.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/salt/gmath.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 *** gmath.h 9 Feb 2007 16:09:52 -0000 1.2.2.1 --- gmath.h 9 Feb 2007 20:12:08 -0000 1.2.2.2 *************** *** 161,165 **** f_inline TYPE gDegToRad(TYPE deg) { ! return (static_cast<TYPE>(deg)) * (M_PI / 180.0); } --- 161,165 ---- f_inline TYPE gDegToRad(TYPE deg) { ! return (static_cast<TYPE>(deg * (M_PI / 180.0))); } |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:05
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347/oxygen Added Files: Tag: WIN32 oxygen.vcproj Log Message: --- NEW FILE: oxygen.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="oxygen" ProjectGUID="{DAB59CC4-E184-40CC-A858-27C432A53AAB}" RootNamespace="oxygen" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\win32;..\;..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="agentaspect" > <File RelativePath=".\agentaspect\agentaspect.cpp" > </File> <File RelativePath=".\agentaspect\agentaspect.h" > </File> <File RelativePath=".\agentaspect\agentaspect_c.cpp" > </File> <File RelativePath=".\agentaspect\createaction.h" > </File> <File RelativePath=".\agentaspect\effector.cpp" > </File> <File RelativePath=".\agentaspect\effector.h" > </File> <File RelativePath=".\agentaspect\effector_c.cpp" > </File> <File RelativePath=".\agentaspect\perceptor.cpp" > </File> <File RelativePath=".\agentaspect\perceptor.h" > </File> <File RelativePath=".\agentaspect\perceptor_c.cpp" > </File> </Filter> <Filter Name="controlaspect" > <File RelativePath=".\controlaspect\controlaspect.cpp" > </File> <File RelativePath=".\controlaspect\controlaspect.h" > </File> <File RelativePath=".\controlaspect\controlaspect_c.cpp" > </File> </Filter> <Filter Name="gamecontrolserver" > <File RelativePath=".\gamecontrolserver\actionobject.h" > </File> <File RelativePath=".\gamecontrolserver\actionobject_c.cpp" > </File> <File RelativePath=".\gamecontrolserver\baseparser.h" > </File> <File RelativePath=".\gamecontrolserver\baseparser_c.cpp" > </File> <File RelativePath=".\gamecontrolserver\gamecontrolserver.cpp" > </File> <File RelativePath=".\gamecontrolserver\gamecontrolserver.h" > </File> <File RelativePath=".\gamecontrolserver\gamecontrolserver_c.cpp" > </File> <File RelativePath=".\gamecontrolserver\predicate.cpp" > </File> <File RelativePath=".\gamecontrolserver\predicate.h" > </File> </Filter> <Filter Name="geometryserver" > <File RelativePath=".\geometryserver\geometryserver.cpp" > </File> <File RelativePath=".\geometryserver\geometryserver.h" > </File> <File RelativePath=".\geometryserver\geometryserver_c.cpp" > </File> <File RelativePath=".\geometryserver\indexbuffer.cpp" > </File> <File RelativePath=".\geometryserver\indexbuffer.h" > </File> <File RelativePath=".\geometryserver\meshimporter.cpp" > </File> <File RelativePath=".\geometryserver\meshimporter.h" > </File> <File RelativePath=".\geometryserver\meshimporter_c.cpp" > </File> <File RelativePath=".\geometryserver\stdmeshimporter.cpp" > </File> <File RelativePath=".\geometryserver\stdmeshimporter.h" > </File> <File RelativePath=".\geometryserver\stdmeshimporter_c.cpp" > </File> <File RelativePath=".\geometryserver\trimesh.cpp" > </File> <File RelativePath=".\geometryserver\trimesh.h" > </File> </Filter> <Filter Name="monitorserver" > <File RelativePath=".\monitorserver\custommonitor.cpp" > </File> <File RelativePath=".\monitorserver\custommonitor.h" > </File> <File RelativePath=".\monitorserver\custommonitor_c.cpp" > </File> <File RelativePath=".\monitorserver\monitorcmdparser.cpp" > </File> <File RelativePath=".\monitorserver\monitorcmdparser.h" > </File> <File RelativePath=".\monitorserver\monitorcmdparser_c.cpp" > </File> <File RelativePath=".\monitorserver\monitoritem.h" > </File> <File RelativePath=".\monitorserver\monitoritem_c.cpp" > </File> <File RelativePath=".\monitorserver\monitorserver.cpp" > </File> <File RelativePath=".\monitorserver\monitorserver.h" > </File> <File RelativePath=".\monitorserver\monitorserver_c.cpp" > </File> <File RelativePath=".\monitorserver\monitorsystem.cpp" > </File> <File RelativePath=".\monitorserver\monitorsystem.h" > </File> <File RelativePath=".\monitorserver\monitorsystem_c.cpp" > </File> </Filter> <Filter Name="physicsserver" > <File RelativePath=".\physicsserver\angularmotor.cpp" > </File> <File RelativePath=".\physicsserver\angularmotor.h" > </File> <File RelativePath=".\physicsserver\angularmotor_c.cpp" > </File> <File RelativePath=".\physicsserver\balljoint.cpp" > </File> <File RelativePath=".\physicsserver\balljoint.h" > </File> <File RelativePath=".\physicsserver\balljoint_c.cpp" > </File> <File RelativePath=".\physicsserver\body.cpp" > </File> <File RelativePath=".\physicsserver\body.h" > </File> <File RelativePath=".\physicsserver\body_c.cpp" > </File> <File RelativePath=".\physicsserver\bodycontroller.cpp" > </File> <File RelativePath=".\physicsserver\bodycontroller.h" > </File> <File RelativePath=".\physicsserver\bodycontroller_c.cpp" > </File> <File RelativePath=".\physicsserver\boxcollider.cpp" > </File> <File RelativePath=".\physicsserver\boxcollider.h" > </File> <File RelativePath=".\physicsserver\boxcollider_c.cpp" > </File> <File RelativePath=".\physicsserver\ccylindercollider.cpp" > </File> <File RelativePath=".\physicsserver\ccylindercollider.h" > </File> <File RelativePath=".\physicsserver\ccylindercollider_c.cpp" > </File> <File RelativePath=".\physicsserver\collider.cpp" > </File> <File RelativePath=".\physicsserver\collider.h" > </File> <File RelativePath=".\physicsserver\collider_c.cpp" > </File> <File RelativePath=".\physicsserver\collisionhandler.cpp" > </File> <File RelativePath=".\physicsserver\collisionhandler.h" > </File> <File RelativePath=".\physicsserver\collisionhandler_c.cpp" > </File> <File RelativePath=".\physicsserver\contactjointhandler.cpp" > </File> <File RelativePath=".\physicsserver\contactjointhandler.h" > </File> <File RelativePath=".\physicsserver\contactjointhandler_c.cpp" > </File> <File RelativePath=".\physicsserver\dragcontroller.cpp" > </File> <File RelativePath=".\physicsserver\dragcontroller.h" > </File> <File RelativePath=".\physicsserver\dragcontroller_c.cpp" > </File> <File RelativePath=".\physicsserver\fixedjoint.cpp" > </File> <File RelativePath=".\physicsserver\fixedjoint.h" > </File> <File RelativePath=".\physicsserver\fixedjoint_c.cpp" > </File> <File RelativePath=".\physicsserver\hinge2joint.cpp" > </File> <File RelativePath=".\physicsserver\hinge2joint.h" > </File> <File RelativePath=".\physicsserver\hinge2joint_c.cpp" > </File> <File RelativePath=".\physicsserver\hingejoint.cpp" > </File> <File RelativePath=".\physicsserver\hingejoint.h" > </File> <File RelativePath=".\physicsserver\hingejoint_c.cpp" > </File> <File RelativePath=".\physicsserver\joint.cpp" > </File> <File RelativePath=".\physicsserver\joint.h" > </File> <File RelativePath=".\physicsserver\joint_c.cpp" > </File> <File RelativePath=".\physicsserver\odeobject.cpp" > </File> <File RelativePath=".\physicsserver\odeobject.h" > </File> <File RelativePath=".\physicsserver\odeobject_c.cpp" > </File> <File RelativePath=".\physicsserver\physicsserver.cpp" > </File> <File RelativePath=".\physicsserver\physicsserver.h" > </File> <File RelativePath=".\physicsserver\physicsserver_c.cpp" > </File> <File RelativePath=".\physicsserver\planecollider.cpp" > </File> <File RelativePath=".\physicsserver\planecollider.h" > </File> <File RelativePath=".\physicsserver\planecollider_c.cpp" > </File> <File RelativePath=".\physicsserver\raycollider.cpp" > </File> <File RelativePath=".\physicsserver\raycollider.h" > </File> <File RelativePath=".\physicsserver\raycollider_c.cpp" > </File> <File RelativePath=".\physicsserver\recorderhandler.cpp" > </File> <File RelativePath=".\physicsserver\recorderhandler.h" > </File> <File RelativePath=".\physicsserver\recorderhandler_c.cpp" > </File> <File RelativePath=".\physicsserver\sliderjoint.cpp" > </File> <File RelativePath=".\physicsserver\sliderjoint.h" > </File> <File RelativePath=".\physicsserver\sliderjoint_c.cpp" > </File> <File RelativePath=".\physicsserver\space.cpp" > </File> <File RelativePath=".\physicsserver\space.h" > </File> <File RelativePath=".\physicsserver\space_c.cpp" > </File> <File RelativePath=".\physicsserver\spherecollider.cpp" > </File> <File RelativePath=".\physicsserver\spherecollider.h" > </File> <File RelativePath=".\physicsserver\spherecollider_c.cpp" > </File> <File RelativePath=".\physicsserver\transformcollider.cpp" > </File> <File RelativePath=".\physicsserver\transformcollider.h" > </File> <File RelativePath=".\physicsserver\transformcollider_c.cpp" > </File> <File RelativePath=".\physicsserver\universaljoint.cpp" > </File> <File RelativePath=".\physicsserver\universaljoint.h" > </File> <File RelativePath=".\physicsserver\universaljoint_c.cpp" > </File> <File RelativePath=".\physicsserver\velocitycontroller.cpp" > </File> <File RelativePath=".\physicsserver\velocitycontroller.h" > </File> <File RelativePath=".\physicsserver\velocitycontroller_c.cpp" > </File> <File RelativePath=".\physicsserver\world.cpp" > </File> <File RelativePath=".\physicsserver\world.h" > </File> <File RelativePath=".\physicsserver\world_c.cpp" > </File> </Filter> <Filter Name="sceneserver" > <File RelativePath=".\sceneserver\basenode.cpp" > </File> <File RelativePath=".\sceneserver\basenode.h" > </File> <File RelativePath=".\sceneserver\basenode_c.cpp" > </File> <File RelativePath=".\sceneserver\camera.cpp" > </File> <File RelativePath=".\sceneserver\camera.h" > </File> <File RelativePath=".\sceneserver\camera_c.cpp" > </File> <File RelativePath=".\sceneserver\fpscontroller.cpp" > </File> <File RelativePath=".\sceneserver\fpscontroller.h" > </File> <File RelativePath=".\sceneserver\fpscontroller_c.cpp" > </File> <File RelativePath=".\sceneserver\scene.cpp" > </File> <File RelativePath=".\sceneserver\scene.h" > </File> <File RelativePath=".\sceneserver\scene_c.cpp" > </File> <File RelativePath=".\sceneserver\sceneimporter.h" > </File> <File RelativePath=".\sceneserver\sceneimporter_c.cpp" > </File> <File RelativePath=".\sceneserver\sceneserver.cpp" > </File> <File RelativePath=".\sceneserver\sceneserver.h" > </File> <File RelativePath=".\sceneserver\sceneserver_c.cpp" > </File> <File RelativePath=".\sceneserver\transform.cpp" > </File> <File RelativePath=".\sceneserver\transform.h" > </File> <File RelativePath=".\sceneserver\transform_c.cpp" > </File> </Filter> <Filter Name="simulationserver" > <File RelativePath=".\simulationserver\agentcontrol.cpp" > </File> <File RelativePath=".\simulationserver\agentcontrol.h" > </File> <File RelativePath=".\simulationserver\agentcontrol_c.cpp" > </File> <File RelativePath=".\simulationserver\monitorcontrol.cpp" > </File> <File RelativePath=".\simulationserver\monitorcontrol.h" > </File> <File RelativePath=".\simulationserver\monitorcontrol_c.cpp" > </File> <File RelativePath=".\simulationserver\netbuffer.cpp" > </File> <File RelativePath=".\simulationserver\netbuffer.h" > </File> <File RelativePath=".\simulationserver\netclient.cpp" > </File> <File RelativePath=".\simulationserver\netclient.h" > </File> <File RelativePath=".\simulationserver\netclient_c.cpp" > </File> <File RelativePath=".\simulationserver\netcontrol.cpp" > </File> <File RelativePath=".\simulationserver\netcontrol.h" > </File> <File RelativePath=".\simulationserver\netcontrol_c.cpp" > </File> <File RelativePath=".\simulationserver\netmessage.cpp" > </File> <File RelativePath=".\simulationserver\netmessage.h" > </File> <File RelativePath=".\simulationserver\netmessage_c.cpp" > </File> <File RelativePath=".\simulationserver\simcontrolnode.cpp" > </File> <File RelativePath=".\simulationserver\simcontrolnode.h" > </File> <File RelativePath=".\simulationserver\simcontrolnode_c.cpp" > </File> <File RelativePath=".\simulationserver\simulationserver.cpp" > </File> <File RelativePath=".\simulationserver\simulationserver.h" > </File> <File RelativePath=".\simulationserver\simulationserver_c.cpp" > </File> </Filter> <File RelativePath=".\oxygen.cpp" > </File> <File RelativePath=".\oxygen.h" > </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:05
|
Update of /cvsroot/simspark/simspark/spark/oxygen/geometryserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347/oxygen/geometryserver Modified Files: Tag: WIN32 stdmeshimporter.cpp Log Message: Index: stdmeshimporter.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/geometryserver/stdmeshimporter.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** stdmeshimporter.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- stdmeshimporter.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 *************** *** 309,314 **** float tmp,nx,start_nx,start_ny; ! float l = ccLength * 0.5; ! float a = g2PI / n; float sa = gSin(a); float ca = gCos(a); --- 309,314 ---- float tmp,nx,start_nx,start_ny; ! float l = ccLength * 0.5f; ! float a = static_cast<float>(g2PI / n); float sa = gSin(a); float ca = gCos(a); |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:04
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347 Modified Files: Tag: WIN32 simspark.sln Log Message: Index: simspark.sln =================================================================== RCS file: /cvsroot/simspark/simspark/spark/Attic/simspark.sln,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** simspark.sln 9 Feb 2007 16:22:25 -0000 1.1.2.1 --- simspark.sln 9 Feb 2007 20:11:56 -0000 1.1.2.2 *************** *** 11,18 **** --- 11,24 ---- ProjectSection(ProjectDependencies) = postProject {B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192} + {ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9} {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C} {001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5} + {DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB} EndProjectSection EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygen", "oxygen\oxygen.vcproj", "{DAB59CC4-E184-40CC-A858-27C432A53AAB}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcssnet", "utility\rcssnet\rcssnet.vcproj", "{ABCC65CE-0762-42F2-8459-41722DCF02D9}" + EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution *************** *** 37,40 **** --- 43,54 ---- {FC4C3571-034B-4CB5-9CF3-3411205C9433}.Release|Win32.ActiveCfg = Release|Win32 {FC4C3571-034B-4CB5-9CF3-3411205C9433}.Release|Win32.Build.0 = Release|Win32 + {DAB59CC4-E184-40CC-A858-27C432A53AAB}.Debug|Win32.ActiveCfg = Debug|Win32 + {DAB59CC4-E184-40CC-A858-27C432A53AAB}.Debug|Win32.Build.0 = Debug|Win32 + {DAB59CC4-E184-40CC-A858-27C432A53AAB}.Release|Win32.ActiveCfg = Release|Win32 + {DAB59CC4-E184-40CC-A858-27C432A53AAB}.Release|Win32.Build.0 = Release|Win32 + {ABCC65CE-0762-42F2-8459-41722DCF02D9}.Debug|Win32.ActiveCfg = Debug|Win32 + {ABCC65CE-0762-42F2-8459-41722DCF02D9}.Debug|Win32.Build.0 = Debug|Win32 + {ABCC65CE-0762-42F2-8459-41722DCF02D9}.Release|Win32.ActiveCfg = Release|Win32 + {ABCC65CE-0762-42F2-8459-41722DCF02D9}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:03
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347/oxygen/physicsserver Modified Files: Tag: WIN32 angularmotor_c.cpp contactjointhandler_c.cpp joint.cpp Added Files: Tag: WIN32 transformcollider_c.cpp Log Message: --- NEW FILE: transformcollider_c.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: transformcollider_c.cpp,v 1.1.2.1 2007/02/09 20:11:56 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 "transformcollider.h" using namespace oxygen; using namespace boost; using namespace salt; void CLASS(TransformCollider)::DefineClass() { DEFINE_BASECLASS(oxygen/Collider); } Index: angularmotor_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/angularmotor_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** angularmotor_c.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- angularmotor_c.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 *************** *** 116,120 **** } ! obj->SetAxisAngle(static_cast<Joint::EAxisIndex>(inAxisIdx),inDegAngle); return true; } --- 116,120 ---- } ! obj->SetAxisAngle(static_cast<Joint::EAxisIndex>(inAxisIdx),static_cast<float>(inDegAngle)); return true; } Index: contactjointhandler_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/contactjointhandler_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** contactjointhandler_c.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- contactjointhandler_c.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 *************** *** 50,54 **** } ! obj->SetMinBounceVel(inVel); return true; } --- 50,54 ---- } ! obj->SetMinBounceVel(static_cast<float>(inVel)); return true; } *************** *** 65,69 **** } ! obj->SetBounceValue(inValue); return true; } --- 65,69 ---- } ! obj->SetBounceValue(static_cast<float>(inValue)); return true; } *************** *** 95,99 **** } ! obj->SetContactSoftERP(inERP); return true; } --- 95,99 ---- } ! obj->SetContactSoftERP(static_cast<float>(inERP)); return true; } *************** *** 125,129 **** } ! obj->SetContactSoftCFM(inCFM); return true; } --- 125,129 ---- } ! obj->SetContactSoftCFM(static_cast<float>(inCFM)); return true; } *************** *** 155,159 **** } ! obj->SetContactSlip(inSlip); return true; } --- 155,159 ---- } ! obj->SetContactSlip(static_cast<float>(inSlip)); return true; } *************** *** 170,174 **** } ! obj->SetContactMu(inMu); return true; --- 170,174 ---- } ! obj->SetContactMu(static_cast<float>(inMu)); return true; Index: joint.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/joint.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** joint.cpp 12 Feb 2006 11:36:52 -0000 1.4 --- joint.cpp 9 Feb 2007 20:11:56 -0000 1.4.2.1 *************** *** 182,186 **** } ! return dAreConnected(body1->GetODEBody(),body2->GetODEBody()); } --- 182,190 ---- } ! const bool connected = ! (dAreConnected(body1->GetODEBody(),body2->GetODEBody()) ! == 1); ! ! return connected; } *************** *** 197,202 **** } ! return dAreConnectedExcluding(body1->GetODEBody(),body2->GetODEBody(), ! joint_type); } --- 201,212 ---- } ! const bool connected = ! (dAreConnectedExcluding(body1->GetODEBody(), ! body2->GetODEBody(), ! joint_type ! ) ! == 1); ! ! return connected; } |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:03
|
Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347/oxygen/simulationserver Modified Files: Tag: WIN32 netclient.cpp netcontrol.cpp netmessage.cpp Log Message: Index: netclient.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netclient.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** netclient.cpp 13 Dec 2005 21:26:40 -0000 1.2 --- netclient.cpp 9 Feb 2007 20:11:56 -0000 1.2.2.1 *************** *** 22,29 **** #include "netclient.h" #include <zeitgeist/logserver/logserver.h> - #include <netinet/in.h> #include <rcssnet/exception.hpp> #include <cerrno> using namespace oxygen; using namespace zeitgeist; --- 22,32 ---- #include "netclient.h" #include <zeitgeist/logserver/logserver.h> #include <rcssnet/exception.hpp> #include <cerrno> + #ifndef WIN32 + #include <netinet/in.h> + #endif + using namespace oxygen; using namespace zeitgeist; Index: netmessage.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netmessage.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** netmessage.cpp 5 Dec 2005 21:21:18 -0000 1.1 --- netmessage.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 *************** *** 20,24 **** --- 20,27 ---- #include "netmessage.h" #include "netbuffer.h" + + #ifndef WIN32 #include <netinet/in.h> + #endif using namespace oxygen; *************** *** 38,42 **** { // prefix the message with it's payload length ! unsigned int len = htonl(msg.size()); string prefix((const char*)&len,sizeof(unsigned int)); msg = prefix + msg; --- 41,45 ---- { // prefix the message with it's payload length ! unsigned int len = htonl(static_cast<u_long>(msg.size())); string prefix((const char*)&len,sizeof(unsigned int)); msg = prefix + msg; Index: netcontrol.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netcontrol.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** netcontrol.cpp 5 Dec 2005 21:21:18 -0000 1.1 --- netcontrol.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 *************** *** 21,25 **** #include "netmessage.h" #include <zeitgeist/logserver/logserver.h> - #include <netinet/in.h> #include <rcssnet/exception.hpp> #include <rcssnet/tcpsocket.hpp> --- 21,24 ---- *************** *** 28,31 **** --- 27,34 ---- #include <cerrno> + #ifndef WIN32 + #include <netinet/in.h> + #endif + using namespace rcss::net; using namespace oxygen; *************** *** 344,348 **** } ! int fd = mSocket->getFD(); fd_set readfds; --- 347,351 ---- } ! Socket::SocketDesc fd = mSocket->getFD(); fd_set readfds; |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:12:02
|
Update of /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347/oxygen/gamecontrolserver Modified Files: Tag: WIN32 gamecontrolserver.cpp predicate.cpp Log Message: Index: gamecontrolserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/gamecontrolserver.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** gamecontrolserver.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- gamecontrolserver.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 *************** *** 206,210 **** // the real thing should query the AgentAspect corresponding to // the agent. ! return 0.2; } --- 206,210 ---- // the real thing should query the AgentAspect corresponding to // the agent. ! return 0.2f; } *************** *** 214,218 **** // the real thing should query the AgentAspect corresponding to // the agent ! return 0.1; } --- 214,218 ---- // the real thing should query the AgentAspect corresponding to // the agent ! return 0.1f; } *************** *** 222,226 **** // the real thing should query the AgentAspect corresponding to // the agent. ! return 0.1; } --- 222,226 ---- // the real thing should query the AgentAspect corresponding to // the agent. ! return 0.1f; } Index: predicate.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/predicate.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** predicate.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- predicate.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1 *************** *** 208,212 **** int PredicateList::GetSize() const { ! return mList.size(); } --- 208,212 ---- int PredicateList::GetSize() const { ! return static_cast<int>(mList.size()); } |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:11:20
|
Update of /cvsroot/simspark/simspark/spark/win32 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10253 Modified Files: Tag: WIN32 config.h Log Message: - added have_winsock and have_socket for rcssnet compilation Index: config.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/win32/Attic/config.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 *** config.h 9 Feb 2007 16:11:51 -0000 1.1.2.1 --- config.h 9 Feb 2007 20:11:17 -0000 1.1.2.2 *************** *** 3,4 **** --- 3,7 ---- */ #define PACKAGE_NAME "simspark" + + #define HAVE_WINSOCK2_H + #define HAVE_SOCKET |
|
From: Markus R. <rol...@us...> - 2007-02-09 20:09:37
|
Update of /cvsroot/simspark/simspark/spark/utility/rcssnet In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9359 Modified Files: Tag: WIN32 README addr.cpp addr.hpp exception.cpp socket.cpp socket.hpp socketstreambuf.hpp tcpsocket.cpp tcpsocket.hpp udpsocket.cpp udpsocket.hpp Log Message: - updated intree rcssnet library to 10.011 to take advantage of windows socket implementation Index: udpsocket.hpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/udpsocket.hpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** udpsocket.hpp 19 Dec 2005 19:13:30 -0000 1.1 --- udpsocket.hpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 2,9 **** /*************************************************************************** ! updsocket.hpp - A simple upd socket class ------------------- begin : 08-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... --- 2,9 ---- /*************************************************************************** ! udpsocket.hpp - A simple udp socket class ------------------- begin : 08-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... *************** *** 34,42 **** public: UDPSocket(); UDPSocket( const Addr& addr ); UDPSocket( const Addr& addr, const Addr& dest ); ! protected: ! virtual void doOpen( int& fd ); }; } --- 34,44 ---- public: UDPSocket(); + UDPSocket( SocketDesc& s ); UDPSocket( const Addr& addr ); UDPSocket( const Addr& addr, const Addr& dest ); ! private: ! bool ! doOpen( SocketDesc& fd ); }; } Index: socketstreambuf.hpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/socketstreambuf.hpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** socketstreambuf.hpp 19 Dec 2005 19:13:30 -0000 1.1 --- socketstreambuf.hpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 5,9 **** ------------------- begin : 08-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... --- 5,9 ---- ------------------- begin : 08-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... *************** *** 44,48 **** SocketStreamBuf( Socket& socket, const Addr& dest, ! ConnType conn = CONN_ON_READ, std::streamsize bufsize = 8192 ) : m_socket( socket ), --- 44,48 ---- SocketStreamBuf( Socket& socket, const Addr& dest, ! ConnType conn = CONN_ON_READ, std::streamsize bufsize = 8192 ) : m_socket( socket ), *************** *** 55,59 **** {} ! SocketStreamBuf( Socket& socket, ConnType conn = NO_CONN, --- 55,59 ---- {} ! SocketStreamBuf( Socket& socket, ConnType conn = NO_CONN, *************** *** 67,71 **** {} ! virtual ~SocketStreamBuf() { --- 67,71 ---- {} ! virtual ~SocketStreamBuf() { *************** *** 74,93 **** delete [] m_outbuf; } ! void setEndPoint( const Addr& addr ) { m_end_point = addr; } ! void setConnectType( ConnType conn ) { m_connect = conn; } ! protected: ! virtual bool writeData() { ! int size = (pptr () - m_outbuf) * sizeof(char_type); if( size == 0 ) return true; --- 74,93 ---- delete [] m_outbuf; } ! void setEndPoint( const Addr& addr ) { m_end_point = addr; } ! void setConnectType( ConnType conn ) { m_connect = conn; } ! protected: ! virtual bool writeData() { ! unsigned long size = (unsigned long)((pptr () - m_outbuf) * sizeof(char_type)); if( size == 0 ) return true; *************** *** 98,103 **** return m_socket.send( m_outbuf, size, m_end_point ) > 0; } ! ! virtual int_type overflow( int_type c = EOF ) --- 98,103 ---- return m_socket.send( m_outbuf, size, m_end_point ) > 0; } ! ! virtual int_type overflow( int_type c = EOF ) *************** *** 105,109 **** // this method is supposed to flush the put area of the buffer // to the I/O device ! // if the buffer was not already allocated nor set by user, // do it just now --- 105,109 ---- // this method is supposed to flush the put area of the buffer // to the I/O device ! // if the buffer was not already allocated nor set by user, // do it just now *************** *** 124,130 **** return 0; } ! ! virtual ! int sync() { --- 124,130 ---- return 0; } ! ! virtual ! int sync() { *************** *** 140,151 **** return 0; } ! ! virtual ! int_type ! underflow() { // this method is supposed to read some bytes from the I/O device ! // if the buffer was not already allocated nor set by user, // do it just now --- 140,151 ---- return 0; } ! ! virtual ! int_type ! underflow() { // this method is supposed to read some bytes from the I/O device ! // if the buffer was not already allocated nor set by user, // do it just now *************** *** 154,162 **** m_inbuf = new char_type[m_bufsize]; } ! if( m_remained != 0 ) m_inbuf[0] = m_remained_char; ! ! int readn = m_bufsize * sizeof( char_type ) - m_remained; if( m_socket.isConnected() ) readn = m_socket.recv( m_inbuf + m_remained, --- 154,162 ---- m_inbuf = new char_type[m_bufsize]; } ! if( m_remained != 0 ) m_inbuf[0] = m_remained_char; ! ! int readn = m_bufsize * sizeof( char_type ) - m_remained; if( m_socket.isConnected() ) readn = m_socket.recv( m_inbuf + m_remained, *************** *** 171,176 **** m_socket.connect( addr ); } ! ! if( readn < 0 || readn == 1 && (m_inbuf + m_remained)[ 0 ] == -1 ) { (m_inbuf + m_remained)[ 0 ] = -1; --- 171,176 ---- m_socket.connect( addr ); } ! ! if( readn < 0 || ( readn == 1 && (m_inbuf + m_remained)[ 0 ] == -1 ) ) { (m_inbuf + m_remained)[ 0 ] = -1; *************** *** 180,200 **** setg( m_inbuf, m_inbuf, m_inbuf + totalbytes / sizeof(char_type) ); ! m_remained = totalbytes % sizeof( char_type ); if( m_remained != 0 ) m_remained_char = m_inbuf[totalbytes / sizeof(char_type)]; ! return sgetc(); } ! private: ! // not used SocketStreamBuf( const SocketStreamBuf& ); ! // not used ! SocketStreamBuf& operator=( const SocketStreamBuf& ); ! Socket& m_socket; Addr m_end_point; --- 180,200 ---- setg( m_inbuf, m_inbuf, m_inbuf + totalbytes / sizeof(char_type) ); ! m_remained = totalbytes % sizeof( char_type ); if( m_remained != 0 ) m_remained_char = m_inbuf[totalbytes / sizeof(char_type)]; ! return sgetc(); } ! private: ! // not used SocketStreamBuf( const SocketStreamBuf& ); ! // not used ! SocketStreamBuf& operator=( const SocketStreamBuf& ); ! Socket& m_socket; Addr m_end_point; Index: tcpsocket.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/tcpsocket.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** tcpsocket.cpp 19 Dec 2005 19:13:30 -0000 1.1 --- tcpsocket.cpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 1,28 **** ! /* -*- 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$ ! 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 "tcpsocket.hpp" ! #include "exception.hpp" #include <sys/types.h> #include <sys/socket.h> #include <cerrno> namespace rcss --- 1,42 ---- ! // -*-c++-*- ! /*************************************************************************** ! tcpsocket.cpp - A simple tcp socket class ! ------------------- ! begin : 08-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server ! Maintenance Group. ! email : sse...@li... ! ***************************************************************************/ ! /*************************************************************************** ! * * ! * This program is free software; you can redistribute it and/or modify * ! * it under the terms of the GNU LGPL as published by the Free Software * ! * Foundation; either version 2 of the License, or (at your option) any * ! * later version. * ! * * ! ***************************************************************************/ #include "tcpsocket.hpp" ! ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif ! #include <sys/types.h> + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> + #endif #include <cerrno> + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif + + #ifdef HAVE_WINSOCK2_H + #include "Winsock2.h" + #endif + + #include <iostream> namespace rcss *************** *** 35,38 **** --- 49,56 ---- } + TCPSocket::TCPSocket( SocketDesc& s ) + : Socket( s ) + {} + TCPSocket::TCPSocket( const Addr& addr ) { *************** *** 44,85 **** { open(); ! bind( addr ); connect( dest ); } ! TCPSocket::TCPSocket( int socket ) ! { ! m_open = true; ! m_connected = true; ! m_socket = socket; ! } ! ! void ! TCPSocket::doOpen( int& fd ) { close(); ! fd = ::socket(AF_INET, SOCK_STREAM, 0 ); ! if( fd < 0 ) ! throw OpenErr( errno ); ! } ! ! ! Socket* TCPSocket::accept(Addr& addr) ! { ! socklen_t len = sizeof(struct sockaddr); ! int fd = ::accept( ! m_socket, ! (struct sockaddr *)&( addr.getAddr() ), ! &len ! ); ! ! if (fd < 0) ! { ! throw AcceptErr( errno ); ! } ! ! return new TCPSocket(fd); } - } } --- 62,76 ---- { open(); ! bind( addr ); connect( dest ); } ! bool ! TCPSocket::doOpen( SocketDesc& fd ) { close(); ! fd = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP ); ! return fd >= 0; } } } Index: addr.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/addr.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** addr.cpp 19 Dec 2005 19:13:30 -0000 1.1 --- addr.cpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 5,9 **** ------------------- begin : 07-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... --- 5,9 ---- ------------------- begin : 07-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... *************** *** 20,29 **** #include "addr.hpp" ! #include "exception.hpp" #include <netdb.h> #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> namespace rcss --- 20,52 ---- #include "addr.hpp" ! ! #ifdef HAVE_CONFIG_H ! #include "config.h" ! #endif ! ! #ifdef HAVE_NETDB_H #include <netdb.h> + #endif + #include <sys/types.h> + + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> + #endif + #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> + #endif + + #ifdef HAVE_WINSOCK2_H + #include "Winsock2.h" + #endif + + #include "handler.hpp" + #include "exception.hpp" + #include <iostream> + #include <errno.h> namespace rcss *************** *** 36,65 **** class AddrImpl { ! public: ! AddrImpl() ! : m_addr() ! { memset( (char *)&m_addr, 0, sizeof( m_addr ) ); } ! ! AddrImpl( const Addr::AddrType& addr ) ! : m_addr( addr ) ! {} ! AddrImpl( Addr::PortType port ) { ! memset( (char *)&m_addr, 0, sizeof( m_addr ) ) ; ! m_addr.sin_family = AF_INET ; ! m_addr.sin_addr.s_addr = htonl( INADDR_ANY ); ! m_addr.sin_port = htons( port ); } ! AddrImpl( Addr::PortType port, Addr::HostType host ) { ! memset( (char *)&m_addr, 0, sizeof( m_addr ) ) ; ! m_addr.sin_family = AF_INET ; ! m_addr.sin_addr.s_addr = htonl( host ); ! m_addr.sin_port = htons( port ); } AddrImpl( Addr::PortType port, const std::string& host ) ! : m_host_name( host ) { struct hostent* host_ent --- 59,100 ---- class AddrImpl { ! private: ! void ! setAddr( Addr::PortType port, Addr::HostType host ) ! { ! memset( (char *)&m_addr, 0, sizeof( m_addr ) ) ; ! m_addr.sin_family = AF_INET ; ! m_addr.sin_addr.s_addr = host; ! m_addr.sin_port = port; ! } ! ! bool ! setPortRaw( Addr::PortType port ) { ! m_addr.sin_port = port; ! return true; } ! ! bool ! setHostRaw( Addr::HostType host ) { ! m_addr.sin_addr.s_addr = host; ! return true; } + public: + AddrImpl( const Addr::AddrType& addr ) + : m_handler( Handler::instance() ), + m_addr( addr ) + {} + AddrImpl( Addr::PortType port, Addr::HostType host ) + : m_handler( Handler::instance() ) + { + setAddr( htons( port ), htonl( host ) ); + } + AddrImpl( Addr::PortType port, const std::string& host ) ! : m_handler( Handler::instance() ), m_host_name( host ) { struct hostent* host_ent *************** *** 75,78 **** --- 110,181 ---- } + + bool + setPort( Addr::PortType port ) + { + m_port_name = std::string(); + return setPortRaw( htons( port ) ); + } + + bool + setPort( const std::string& port, + const std::string& proto = "" ) + { + if( port.empty() ) + { + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) + errno = WSAHOST_NOT_FOUND; + #else + errno = HOST_NOT_FOUND; + #endif + return false; + } + struct servent* serv_ent + = (struct servent*)getservbyname( port.c_str(), + ( proto.empty() + ? NULL + : proto.c_str() ) ); + if( serv_ent == NULL ) + { + return false; + } + m_port_name = port; + return setPortRaw( serv_ent->s_port ); + } + + bool + setHost( Addr::HostType host ) + { + m_host_name = std::string(); + return setHostRaw( htonl( host ) ); + } + + bool + setHost( const std::string& host ) + { + if( host.empty() ) + { + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) + errno = WSAHOST_NOT_FOUND; + #else + errno = HOST_NOT_FOUND; + #endif + return false; + } + struct hostent* host_ent + = (struct hostent*)gethostbyname( host.c_str() ); + if( host_ent == NULL ) + { + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) + return false; + #else + return false; + #endif + } + m_host_name = host; + return setHostRaw( ((struct in_addr *)host_ent->h_addr_list[0])->s_addr ); + } + + const Addr::AddrType& getAddr() const *************** *** 82,90 **** getPort() const { return ntohs( m_addr.sin_port ); } ! ! void ! setPort(Addr::PortType port) ! { m_addr.sin_port = htons(port); } ! Addr::HostType getHost() const --- 185,189 ---- getPort() const { return ntohs( m_addr.sin_port ); } ! Addr::HostType getHost() const *************** *** 100,123 **** return m_host_name; } ! private: ! Addr::AddrType m_addr; mutable std::string m_host_name; }; ! Addr::Addr() ! : m_impl( new AddrImpl() ) {} ! Addr::Addr( const AddrType& addr ) : m_impl( new AddrImpl( addr ) ) {} ! Addr::Addr( PortType port ) ! : m_impl( new AddrImpl( port ) ) ! {} ! Addr::Addr( PortType port, HostType host ) ! : m_impl( new AddrImpl( port, host ) ) ! {} Addr::Addr( PortType port, const std::string& host ) --- 199,261 ---- return m_host_name; } ! ! std::string ! getPortStr( const std::string& proto = "" ) const ! { ! if( m_port_name.empty() ) ! { ! struct servent* serv_ent = getservbyport( m_addr.sin_port, ! ( proto.empty() ! ? NULL ! : proto.c_str() ) ); ! if( serv_ent == NULL ) ! { ! return m_port_name; ! } ! m_port_name = serv_ent->s_name; ! } ! return m_port_name; ! } ! private: ! Handler& m_handler; ! Addr::AddrType m_addr; mutable std::string m_host_name; + mutable std::string m_port_name; + Addr::Error m_error; + int m_errno; }; ! Addr::Addr( PortType port, HostType host ) ! : m_impl( new AddrImpl( port, host ) ) {} ! Addr::Addr( const AddrType& addr ) : m_impl( new AddrImpl( addr ) ) {} ! bool ! Addr::setPort( PortType port ) ! { ! return m_impl->setPort( port ); ! } ! bool ! Addr::setPort( const std::string& port, ! const std::string& proto ) ! { ! return m_impl->setPort( port, proto ); ! } ! ! bool ! Addr::setHost( HostType host ) ! { ! return m_impl->setHost( host ); ! } ! ! bool ! Addr::setHost( const std::string& host ) ! { ! return m_impl->setHost( host ); ! } Addr::Addr( PortType port, const std::string& host ) *************** *** 125,128 **** --- 263,267 ---- {} + const Addr::AddrType& Addr::getAddr() const *************** *** 133,140 **** { return m_impl->getPort(); } - void - Addr::setPort(PortType port) - { m_impl->setPort(port); } - Addr::HostType Addr::getHost() const --- 272,275 ---- *************** *** 145,161 **** { return m_impl->getHostStr(); } ! bool ! Addr::operator==( const Addr& addr ) const { ! return ( addr.getAddr().sin_port == getAddr().sin_port ! && ( addr.getAddr().sin_addr.s_addr ! == getAddr().sin_addr.s_addr ) ); } bool ! Addr::operator < ( const Addr& addr ) const { ! const Addr::HostType host_a = getHost(); ! const Addr::HostType host_b = addr.getHost(); if (host_a != host_b) --- 280,309 ---- { return m_impl->getHostStr(); } ! std::string ! Addr::getPortStr( const std::string& proto ) const ! { return m_impl->getPortStr( proto ); } ! ! bool ! operator==( const Addr& a, ! const Addr& b ) { ! return ( a.getAddr().sin_port == b.getAddr().sin_port ! && ( a.getAddr().sin_addr.s_addr ! == b.getAddr().sin_addr.s_addr ) ); } + bool + operator!=( const Addr& a, + const Addr& b ) + { + return !(a == b); + } + bool ! operator < ( const Addr& a, ! const Addr& b ) { ! const Addr::HostType host_a = a.getHost(); ! const Addr::HostType host_b = b.getHost(); if (host_a != host_b) *************** *** 164,168 **** } ! return getPort() < addr.getPort(); } --- 312,316 ---- } ! return a.getPort() < b.getPort(); } *************** *** 170,173 **** --- 318,322 ---- operator<<( std::ostream& o, const rcss::net::Addr& addr ) { return o << '(' << addr.getPort() << ':' << addr.getHostStr() << ')'; } + } } Index: addr.hpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/addr.hpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** addr.hpp 19 Dec 2005 19:13:30 -0000 1.1 --- addr.hpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 5,9 **** ------------------- begin : 07-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... --- 5,9 ---- ------------------- begin : 07-JAN-2003 ! copyright : (C) 2003 by The RoboCup Soccer Server Maintenance Group. email : sse...@li... *************** *** 33,37 **** { class AddrImpl; ! class Addr { --- 33,37 ---- { class AddrImpl; ! class Addr { *************** *** 41,78 **** typedef struct sockaddr_in AddrType; static const HostType BROADCAST; static const HostType ANY; ! ! Addr(); ! Addr( const AddrType& addr ); ! Addr( PortType port ); ! Addr( PortType port, HostType host ); Addr( PortType port, const std::string& host ); const AddrType& getAddr() const; ! PortType getPort() const; ! ! void ! setPort(PortType port); ! HostType getHost() const; ! std::string getHostStr() const; ! bool operator == ( const Addr& addr ) const; ! bool operator < (const Addr& addr ) const; ! ! private: boost::shared_ptr< AddrImpl > m_impl; }; ! std::ostream& operator<<( std::ostream& o, const Addr& addr ); - } } --- 41,93 ---- typedef struct sockaddr_in AddrType; + enum Error { eADDR_OK, eSERV_NOT_FOUND, eHOST_NOT_FOUND }; + static const HostType BROADCAST; static const HostType ANY; ! ! Addr( PortType port = 0, HostType host = Addr::ANY ); Addr( PortType port, const std::string& host ); + Addr( const AddrType& addr ); + + bool setPort( PortType port = 0 ); + bool setPort( const std::string& port, + const std::string& proto = "" ); + bool setHost( HostType host = Addr::ANY ); + bool setHost( const std::string& host ); + const AddrType& getAddr() const; ! PortType getPort() const; ! HostType getHost() const; ! std::string getHostStr() const; ! std::string ! getPortStr( const std::string& proto = "" ) const; ! ! private: boost::shared_ptr< AddrImpl > m_impl; }; + + bool + operator ==( const Addr& a, + const Addr& b ); + + bool + operator !=( const Addr& a, + const Addr& b ); ! bool ! operator < ( const Addr& a, ! const Addr& b ); ! ! std::ostream& operator<<( std::ostream& o, const Addr& addr ); } } Index: socket.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/socket.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** socket.cpp 19 Dec 2005 19:13:30 -0000 1.1 --- socket.cpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 24,31 **** --- 24,40 ---- #include <sys/types.h> + + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> + #endif + #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> + #endif + #ifdef HAVE_UNISTD_H #include <unistd.h> + #endif #include <fcntl.h> #include <cerrno> *************** *** 33,37 **** #include <poll.h> #endif - #include "exception.hpp" #ifndef HAVE_SOCKLEN_T --- 42,45 ---- *************** *** 39,42 **** --- 47,58 ---- #endif + #ifdef HAVE_WINSOCK2_H + #include "Winsock2.h" + #endif + + #include "handler.hpp" + #include "tcpsocket.hpp" + + #include <iostream> namespace rcss *************** *** 44,61 **** namespace net { Socket::Socket() ! : m_socket( 0 ), ! m_open( false ), ! m_connected( false ) {} Socket::~Socket() { close(); } ! void Socket::open() { ! doOpen( m_socket ); ! m_open = true; int err = setCloseOnExec(); if( err < 0 ) --- 60,108 ---- namespace net { + + + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) + const Socket::SocketDesc Socket::INVALIDSOCKET = INVALID_SOCKET; + #else + const Socket::SocketDesc Socket::INVALIDSOCKET = -1; + #endif + + + void + Socket::closeFD( SocketDesc* s ) + { + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) + ::closesocket( *s ); + #else + ::close( *s ); + #endif + delete s; + } + Socket::Socket() ! : m_handler( &Handler::instance() ) {} + Socket::Socket( SocketDesc s ) + : m_handler( &Handler::instance() ) + { + m_handle = boost::shared_ptr< SocketDesc >( new SocketDesc( s ), + Socket::closeFD ); + } + + Socket::~Socket() { close(); } ! bool Socket::open() { ! SocketDesc s; ! if( !doOpen( s ) ) ! return false; ! ! m_handle = boost::shared_ptr< SocketDesc >( new SocketDesc( s ), ! Socket::closeFD ); ! #if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) int err = setCloseOnExec(); if( err < 0 ) *************** *** 63,92 **** err = errno; close(); ! throw OpenErr( err ); } } ! void Socket::bind( const Addr& addr ) { ! int err = ::bind( m_socket, ! (struct sockaddr *)&( addr.getAddr() ), ! sizeof( addr.getAddr() ) ); ! if( err < 0 ) ! throw BindErr( errno ); ! } ! ! void ! Socket::listen( int backlog ) ! { ! int err = ::listen( m_socket, backlog ); ! if (err < 0 ) ! throw ListenErr( errno ); ! } ! ! Socket* Socket::accept(Addr& addr) ! { ! throw AcceptErr( EOPNOTSUPP ); ! return 0; } --- 110,137 ---- err = errno; close(); ! return false; } + #endif + return true; } ! bool Socket::bind( const Addr& addr ) { ! if( isOpen() ) ! { ! int err = ::bind( getFD(), ! (struct sockaddr *)&( addr.getAddr() ), ! sizeof( addr.getAddr() ) ); ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! if( err == SOCKET_ERROR ) ! return false; ! #else ! if( err < 0 ) ! return false; ! #endif ! return true; ! } ! return false; } *************** *** 94,118 **** Socket::getName() const { ! Addr::AddrType name; ! socklen_t from_len = sizeof( name ); ! int err = ::getsockname( m_socket, ! (struct sockaddr *)&name, ! &from_len ); ! if( err < 0 ) ! throw GetNameErr( errno ); ! ! return Addr( name ); } ! void Socket::connect( const Addr& addr ) { ! int err = ::connect( m_socket, ! (const struct sockaddr *)&( addr.getAddr() ), ! sizeof( addr.getAddr() ) ); ! if ( err < 0 ) ! throw ConnectErr( errno ); ! m_connected = true; } --- 139,185 ---- Socket::getName() const { ! if( isOpen() ) ! { ! Addr::AddrType name; ! socklen_t from_len = sizeof( name ); ! int err = ::getsockname( getFD(), ! (struct sockaddr *)&name, ! &from_len ); ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) ! if( err == SOCKET_ERROR ) ! { ! err = WSAGetLastError(); ! return Addr(); ! } ! #else ! if( err < 0 ) ! return Addr(); ! #endif ! return Addr( name ); ! } ! else ! return Addr(); } ! bool Socket::connect( const Addr& addr ) { ! if( isOpen() ) ! { ! int err = ::connect( getFD(), ! (const struct sockaddr *)&( addr.getAddr() ), ! sizeof( addr.getAddr() ) ); ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) ! if( err == SOCKET_ERROR ) ! return false; ! #else ! if( err < 0 ) ! return false; ! #endif ! return true; ! } ! else ! return false; } *************** *** 120,132 **** Socket::getPeer() const { ! Addr::AddrType name; ! socklen_t from_len = sizeof( name ); ! int err = ::getpeername( m_socket, ! (struct sockaddr *)&name, ! &from_len ); ! if( err < 0 ) ! throw GetNameErr( errno ); ! ! return Addr( name ); } --- 187,210 ---- Socket::getPeer() const { ! if( isOpen() ) ! { ! Addr::AddrType name; ! socklen_t from_len = sizeof( name ); ! int err = ::getpeername( getFD(), ! (struct sockaddr *)&name, ! &from_len ); ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(CYGWIN) ! if( err == SOCKET_ERROR ) ! { ! return Addr(); ! } ! #else ! if( err < 0 ) ! return Addr(); ! #endif ! return Addr( name ); ! } ! else ! return Addr(); } *************** *** 134,144 **** Socket::close() { ! if( m_open ) ! { ! m_open = false; ! ::close( m_socket ); ! m_socket = 0; ! } ! m_connected = false; } --- 212,216 ---- Socket::close() { ! m_handle.reset(); } *************** *** 146,151 **** Socket::setCloseOnExec( bool on ) { ! return fcntl( m_socket, F_SETFD, ! ( on ? FD_CLOEXEC : ~FD_CLOEXEC ) ); } --- 218,236 ---- Socket::setCloseOnExec( bool on ) { ! if( isOpen() ) ! { ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! errno = EPERM; ! return -1; ! #else ! return fcntl( getFD(), F_SETFD, ! ( on ? FD_CLOEXEC : ~FD_CLOEXEC ) ); ! #endif ! } ! else ! { ! errno = EPERM; ! return -1; ! } } *************** *** 153,166 **** Socket::setNonBlocking( bool on ) { ! int flags = fcntl( m_socket, F_GETFL, 0 ); ! if( flags == -1 ) ! return flags; ! if( on ) ! return fcntl( m_socket, F_SETFL, ! O_NONBLOCK | flags ); else ! return fcntl( m_socket, F_SETFL, ! ~O_NONBLOCK & flags ); } --- 238,264 ---- Socket::setNonBlocking( bool on ) { ! if( isOpen() ) ! { ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! u_long tmp = on; ! return ioctlsocket( getFD(), FIONBIO, &tmp ); ! #else ! int flags = fcntl( getFD(), F_GETFL, 0 ); ! if( flags == -1 ) ! return flags; ! if( on ) ! return fcntl( getFD(), F_SETFL, ! O_NONBLOCK | flags ); ! else ! return fcntl( getFD(), F_SETFL, ! ~O_NONBLOCK & flags ); ! #endif ! } else ! { ! errno = EPERM; ! return -1; ! } } *************** *** 169,184 **** { #ifdef O_ASYNC ! int flags = fcntl( m_socket, F_GETFL, 0 ); ! if ( on ) ! return fcntl ( m_socket, F_SETFL, O_ASYNC | flags ); ! else ! return fcntl ( m_socket, F_SETFL, ! ~O_ASYNC & flags ); ! #else errno = EPERM; return -1; ! #endif } --- 267,285 ---- { #ifdef O_ASYNC ! if( isOpen() ) ! { ! int flags = fcntl( getFD(), F_GETFL, 0 ); ! if ( on ) ! return fcntl ( getFD(), F_SETFL, O_ASYNC | flags ); ! else ! return fcntl ( getFD(), F_SETFL, ! ~O_ASYNC & flags ); ! } ! #endif errno = EPERM; return -1; ! } *************** *** 187,211 **** { #ifdef SO_BROADCAST ! int ison = on; ! return setsockopt( m_socket, SOL_SOCKET, ! SO_BROADCAST, (void*)&ison, sizeof( int ) ); #else errno = EPERM; return -1; - #endif } ! int Socket::getFD() const ! { return m_socket; } bool Socket::isOpen() const ! { return m_open; } bool Socket::isConnected() const { ! return m_connected; } --- 288,320 ---- { #ifdef SO_BROADCAST ! if( isOpen() ) ! { ! int ison = on; ! return setsockopt( getFD(), SOL_SOCKET, ! SO_BROADCAST, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (const char*)&ison, #else + (void*)&ison, + #endif + sizeof( int ) ); + } + #endif errno = EPERM; return -1; } ! Socket::SocketDesc Socket::getFD() const ! { return ( isOpen() ? *(m_handle.get()) : Socket::INVALIDSOCKET ); } bool Socket::isOpen() const ! { return m_handle.get() != NULL; } bool Socket::isConnected() const { ! return getPeer() != Addr(); } *************** *** 223,227 **** if( check == DONT_CHECK ) { ! return ::sendto( m_socket, msg, len, flags, (struct sockaddr *)&( dest.getAddr() ), sizeof( dest.getAddr() ) ); --- 332,342 ---- if( check == DONT_CHECK ) { ! return ::sendto( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags, (struct sockaddr *)&( dest.getAddr() ), sizeof( dest.getAddr() ) ); *************** *** 231,240 **** for(;;) { ! int sent = ::sendto( m_socket, msg, len, flags, (struct sockaddr *)&( dest.getAddr() ), sizeof( dest.getAddr() ) ); if( sent != -1 || ( errno != EINTR ! && errno != EWOULDBLOCK ) ) return sent; } --- 346,366 ---- for(;;) { ! int sent = ::sendto( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags, (struct sockaddr *)&( dest.getAddr() ), sizeof( dest.getAddr() ) ); if( sent != -1 || ( errno != EINTR ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! && errno != WSAEWOULDBLOCK ! #else ! && errno != EWOULDBLOCK ! #endif ! ) ) return sent; } *************** *** 250,254 **** if( check == DONT_CHECK ) { ! return ::send( m_socket, msg, len, flags ); } else --- 376,386 ---- if( check == DONT_CHECK ) { ! return ::send( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags ); } else *************** *** 256,263 **** for(;;) { ! int sent = ::send( m_socket, msg, len, flags ); if( sent != -1 || ( errno != EINTR ! && errno != EWOULDBLOCK ) ) return sent; } --- 388,406 ---- for(;;) { ! int sent = ::send( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags ); if( sent != -1 || ( errno != EINTR ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! && errno != WSAEWOULDBLOCK ! #else ! && errno != EWOULDBLOCK ! #endif ! ) ) return sent; } *************** *** 276,280 **** Addr::AddrType addr; socklen_t from_len = sizeof( addr ); ! int rval = ::recvfrom( m_socket, msg, len, flags, (struct sockaddr *)&addr, &from_len ); from = Addr( addr ); --- 419,429 ---- Addr::AddrType addr; socklen_t from_len = sizeof( addr ); ! int rval = ::recvfrom( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags, (struct sockaddr *)&addr, &from_len ); from = Addr( addr ); *************** *** 287,291 **** Addr::AddrType addr; socklen_t from_len = sizeof( addr ); ! int received = ::recvfrom( m_socket, msg, len, flags, (struct sockaddr *)&addr, &from_len ); --- 436,446 ---- Addr::AddrType addr; socklen_t from_len = sizeof( addr ); ! int received = ::recvfrom( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags, (struct sockaddr *)&addr, &from_len ); *************** *** 305,314 **** { if( check == DONT_CHECK ) ! return ::recv( m_socket, msg, len, flags ); else { for(;;) { ! int received = ::recv( m_socket, msg, len, flags ); if( received != -1 || errno != EINTR ) --- 460,481 ---- { if( check == DONT_CHECK ) ! return ::recv( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags ); else { for(;;) { ! int received = ::recv( getFD(), msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags ); if( received != -1 || errno != EINTR ) *************** *** 318,321 **** --- 485,520 ---- } + bool + Socket::listen( int backlog ) + { + return ::listen( getFD(), backlog ) == 0; + } + + bool + Socket::accept( Socket& sock ) + { + SocketDesc fd = ::accept( getFD(), NULL, 0 ); + if( fd == INVALIDSOCKET ) + return false; + sock = TCPSocket( fd ); + return true; + } + + Socket* Socket::accept(Addr& addr) + { + socklen_t len = sizeof(struct sockaddr); + SocketDesc fd = ::accept( getFD(), + (struct sockaddr *)&( addr.getAddr() ), + &len + ); + + if (fd == INVALIDSOCKET ) + { + return 0; + } + + return new TCPSocket(fd); + } + int Socket::recv( int timeout, *************** *** 326,330 **** { #if defined (HAVE_POLL_H) ! pollfd fd = { m_socket, POLLIN | POLLPRI, 0 }; int res = poll( &fd, 1, timeout ); if( res == 0 ) --- 525,529 ---- { #if defined (HAVE_POLL_H) ! pollfd fd = { getFD(), POLLIN | POLLPRI, 0 }; int res = poll( &fd, 1, timeout ); if( res == 0 ) *************** *** 335,339 **** else if( res == 1 ) { ! return recv( msg, len, from, flags ); } else --- 534,544 ---- else if( res == 1 ) { ! return recv( msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! from, flags ); } else *************** *** 354,358 **** { #if defined (HAVE_POLL_H) ! pollfd fd = { m_socket, POLLIN | POLLPRI, 0 }; int res = poll( &fd, 1, timeout ); if( res == 0 ) --- 559,563 ---- { #if defined (HAVE_POLL_H) ! pollfd fd = { getFD(), POLLIN | POLLPRI, 0 }; int res = poll( &fd, 1, timeout ); if( res == 0 ) *************** *** 363,367 **** else if( res == 1 ) { ! return recv( msg, len, flags ); } else --- 568,578 ---- else if( res == 1 ) { ! return recv( msg, ! #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ! (int)len, ! #else ! len, ! #endif ! flags ); } else Index: socket.hpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/socket.hpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** socket.hpp 19 Dec 2005 19:13:30 -0000 1.1 --- socket.hpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 22,57 **** #define RCSS_NET_SOCKET_HPP #include <boost/cstdint.hpp> #include "addr.hpp" namespace rcss { namespace net { class Socket { public: enum CheckingType { CHECK, DONT_CHECK }; Socket(); virtual ~Socket(); ! void open(); ! void bind( const Addr& addr ); - void - listen( int backlog ); - - virtual Socket* accept(Addr& addr); - Addr getName() const; ! void connect( const Addr& addr ); --- 22,78 ---- #define RCSS_NET_SOCKET_HPP + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif + #include <boost/cstdint.hpp> + #include <boost/shared_ptr.hpp> #include "addr.hpp" + #ifdef HAVE_WINSOCK2_H + #include "Winsock2.h" + #endif + namespace rcss { namespace net { + class Handler; + class Socket { public: + #ifdef HAVE_SOCKET + typedef SOCKET SocketDesc; + #else + typedef int SocketDesc; + #endif + + static const SocketDesc INVALIDSOCKET; + enum CheckingType { CHECK, DONT_CHECK }; + public: + static + void + closeFD( SocketDesc* s ); + Socket(); + Socket( SocketDesc s ); + virtual ~Socket(); ! bool open(); ! bool bind( const Addr& addr ); Addr getName() const; ! bool connect( const Addr& addr ); *************** *** 74,78 **** setBroadcast( bool on = true ); ! int getFD() const; --- 95,99 ---- setBroadcast( bool on = true ); ! SocketDesc getFD() const; *************** *** 112,115 **** --- 133,144 ---- CheckingType check = CHECK ); + bool + accept( Socket& sock ); + + Socket* accept(Addr& addr); + + bool + listen( int backlog ); + // The following two methods allow a timeout to be specified. // Overall, it's slower than the untimed varients so if you do *************** *** 131,147 **** int flags = 0 ); ! protected: virtual ! void ! doOpen( int& fd ) = 0; ! ! // not used ! Socket( const Socket& ); ! Socket& operator=( const Socket& ); ! protected: ! int m_socket; ! bool m_open; ! bool m_connected; }; } --- 160,171 ---- int flags = 0 ); ! private: virtual ! bool ! doOpen( SocketDesc& fd ) = 0; ! private: ! Handler* m_handler; ! boost::shared_ptr< SocketDesc > m_handle; }; } Index: udpsocket.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/udpsocket.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** udpsocket.cpp 19 Dec 2005 19:13:30 -0000 1.1 --- udpsocket.cpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 2,6 **** /*************************************************************************** ! updsocket.cpp - A simple upd socket class ------------------- begin : 08-JAN-2003 --- 2,6 ---- /*************************************************************************** ! udpsocket.cpp - A simple udp socket class ------------------- begin : 08-JAN-2003 *************** *** 20,29 **** #include "udpsocket.hpp" #include <sys/types.h> #include <sys/socket.h> #include <cerrno> ! #include "exception.hpp" #include <netinet/in.h> namespace rcss --- 20,42 ---- #include "udpsocket.hpp" + + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include <sys/types.h> + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> + #endif #include <cerrno> ! #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> + #endif + + #ifdef HAVE_WINSOCK2_H + #include "Winsock2.h" + #endif + #include <iostream> namespace rcss *************** *** 36,39 **** --- 49,56 ---- } + UDPSocket::UDPSocket( SocketDesc& s ) + : Socket( s ) + {} + UDPSocket::UDPSocket( const Addr& addr ) { *************** *** 45,59 **** { open(); ! bind( addr ); connect( dest ); } ! void ! UDPSocket::doOpen( int& fd ) { close(); fd = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP ); ! if( fd < 0 ) ! throw OpenErr( errno ); } } --- 62,75 ---- { open(); ! bind( addr ); connect( dest ); } ! bool ! UDPSocket::doOpen( SocketDesc& fd ) { close(); fd = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP ); ! return fd >= 0; } } Index: exception.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/exception.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** exception.cpp 19 Dec 2005 19:13:30 -0000 1.1 --- exception.cpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 25,30 **** --- 25,35 ---- #include "exception.hpp" #include <cstring> + + #ifdef WIN32 + #include <winsock2.h> + #else #include <sys/types.h> #include <netinet/in.h> + #endif #ifdef HAVE_ARPA_NAMESER_H *************** *** 57,61 **** return "Network error"; #else ! return hstrerror( m_err ); #endif } --- 62,66 ---- return "Network error"; #else ! return std::strerror( m_err ); #endif } Index: tcpsocket.hpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/tcpsocket.hpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** tcpsocket.hpp 19 Dec 2005 19:13:30 -0000 1.1 --- tcpsocket.hpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 *************** *** 1,23 **** ! /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- ! this file is part... [truncated message content] |
|
From: Markus R. <rol...@us...> - 2007-02-09 16:23:21
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2380 Added Files: Tag: WIN32 coretest.vcproj Log Message: - add vc2005 project files --- NEW FILE: coretest.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="coretest" ProjectGUID="{FC4C3571-034B-4CB5-9CF3-3411205C9433}" RootNamespace="coretest" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="0" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\win32;..\..\;"C:\ruby\lib\ruby\1.8\i386-mswin32"" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib wsock32.lib" LinkIncremental="2" AdditionalLibraryDirectories="" GenerateDebugInformation="true" SubSystem="1" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="0" WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="C:\develop\x\simspark\spark" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCManifestTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCAppVerifierTool" /> <Tool Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <File RelativePath=".\main.cpp" > </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Markus R. <rol...@us...> - 2007-02-09 16:23:15
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1878/zeitgeist Added Files: Tag: WIN32 zeitgeist.vcproj Log Message: - add vc2005 project files --- NEW FILE: zeitgeist.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8,00" Name="zeitgeist" ProjectGUID="{B3FAF507-1CEB-437C-8272-30C8DC236192}" RootNamespace="zeitgeist" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""C:\ruby\lib\ruby\1.8\i386-mswin32";..\" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="0" WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCMIDLTool" /> <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="fileserver" > <File RelativePath=".\fileserver\fileserver.cpp" > </File> <File RelativePath=".\fileserver\fileserver.h" > </File> <File RelativePath=".\fileserver\fileserver_c.cpp" > </File> <File RelativePath=".\fileserver\filesystem.h" > </File> <File RelativePath=".\fileserver\filesystem_c.cpp" > </File> </Filter> <Filter Name="logserver" > <File RelativePath=".\logserver\logserver.cpp" > </File> <File RelativePath=".\logserver\logserver.h" > </File> <File RelativePath=".\logserver\logserver_c.cpp" > </File> <File RelativePath=".\logserver\logserverstreambuf.cpp" > </File> <File RelativePath=".\logserver\logserverstreambuf.h" > </File> </Filter> <Filter Name="randomserver" > <File RelativePath=".\randomserver\randomserver.cpp" > </File> <File RelativePath=".\randomserver\randomserver.h" > </File> <File RelativePath=".\randomserver\randomserver_c.cpp" > </File> </Filter> <Filter Name="scriptserver" > <File RelativePath=".\scriptserver\gcvalue.cpp" > </File> <File RelativePath=".\scriptserver\gcvalue.h" > </File> <File RelativePath=".\scriptserver\rubywrapper.cpp" > </File> <File RelativePath=".\scriptserver\rubywrapper.h" > </File> <File RelativePath=".\scriptserver\scriptserver.cpp" > </File> <File RelativePath=".\scriptserver\scriptserver.h" > </File> <File RelativePath=".\scriptserver\scriptserver_c.cpp" > </File> </Filter> <File RelativePath=".\class.cpp" > </File> <File RelativePath=".\class.h" > </File> <File RelativePath=".\class_c.cpp" > </File> <File RelativePath=".\core.cpp" > </File> <File RelativePath=".\core.h" > </File> <File RelativePath=".\corecontext.cpp" > </File> <File RelativePath=".\corecontext.h" > </File> <File RelativePath=".\leaf.cpp" > </File> <File RelativePath=".\leaf.h" > </File> <File RelativePath=".\leaf_c.cpp" > </File> <File RelativePath=".\node.cpp" > </File> <File RelativePath=".\node.h" > </File> <File RelativePath=".\node_c.cpp" > </File> <File RelativePath=".\object.cpp" > </File> <File RelativePath=".\object.h" > </File> <File RelativePath=".\object_c.cpp" > </File> <File RelativePath=".\object_c.h" > </File> <File RelativePath=".\parameterlist.cpp" > </File> <File RelativePath=".\parameterlist.h" > </File> <File RelativePath=".\zeitgeist.cpp" > </File> <File RelativePath=".\zeitgeist.h" > </File> </Files> <Globals> </Globals> </VisualStudioProject> |
