simspark-cvs — CVS Commit Notifications via Email

[simspark-cvs] simspark/spark/utility utility.vcproj,NONE,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1878/utility

Added Files:
      Tag: WIN32
	utility.vcproj 
Log Message:
- add vc2005 project files

--- NEW FILE: utility.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="utility"
	ProjectGUID="{001EB793-1243-46C2-B693-B23BD1D3D1B5}"
	RootNamespace="utility"
	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"
				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"
				CompileAs="1"
			/>
			<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"
				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="tinyxml"
			>
			<File
				RelativePath=".\tinyxml\tinystr.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="2"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\tinyxml\tinystr.h"
				>
			</File>
			<File
				RelativePath=".\tinyxml\tinyxml.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="2"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\tinyxml\tinyxml.h"
				>
			</File>
			<File
				RelativePath=".\tinyxml\tinyxmlerror.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="2"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\tinyxml\tinyxmlparser.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="2"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\tinyxml\xmlfunctions.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="2"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\tinyxml\xmlfunctions.h"
				>
			</File>
		</Filter>
		<Filter
			Name="sfsexp"
			>
			<File
				RelativePath=".\sfsexp\cstring.c"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="1"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\sfsexp\cstring.h"
				>
			</File>
			<File
				RelativePath=".\sfsexp\faststack.c"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="1"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\sfsexp\faststack.h"
				>
			</File>
			<File
				RelativePath=".\sfsexp\io.c"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="1"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\sfsexp\malloc_util.c"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="1"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\sfsexp\malloc_util.h"
				>
			</File>
			<File
				RelativePath=".\sfsexp\parser.c"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="1"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\sfsexp\sexp.c"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="1"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\sfsexp\sexp.h"
				>
			</File>
			<File
				RelativePath=".\sfsexp\sexp_ops.c"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						CompileAs="1"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath=".\sfsexp\sexp_ops.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[simspark-cvs] simspark/spark/salt salt.vcproj,NONE,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/salt
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1878/salt

Added Files:
      Tag: WIN32
	salt.vcproj 
Log Message:
- add vc2005 project files

--- NEW FILE: salt.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="salt"
	ProjectGUID="{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}"
	RootNamespace="salt"
	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"
				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=".\bounds.cpp"
			>
		</File>
		<File
			RelativePath=".\bounds.h"
			>
		</File>
		<File
			RelativePath=".\defines.h"
			>
		</File>
		<File
			RelativePath=".\fileclasses.cpp"
			>
		</File>
		<File
			RelativePath=".\fileclasses.h"
			>
		</File>
		<File
			RelativePath=".\frustum.cpp"
			>
		</File>
		<File
			RelativePath=".\frustum.h"
			>
		</File>
		<File
			RelativePath=".\gmath.h"
			>
		</File>
		<File
			RelativePath=".\matrix.cpp"
			>
		</File>
		<File
			RelativePath=".\matrix.h"
			>
		</File>
		<File
			RelativePath=".\path.cpp"
			>
		</File>
		<File
			RelativePath=".\path.h"
			>
		</File>
		<File
			RelativePath=".\plane.cpp"
			>
		</File>
		<File
			RelativePath=".\plane.h"
			>
		</File>
		<File
			RelativePath=".\random.h"
			>
		</File>
		<File
			RelativePath=".\rect.h"
			>
		</File>
		<File
			RelativePath=".\salt.h"
			>
		</File>
		<File
			RelativePath=".\sharedlibrary.cpp"
			>
		</File>
		<File
			RelativePath=".\sharedlibrary.h"
			>
		</File>
		<File
			RelativePath=".\tvector.h"
			>
		</File>
		<File
			RelativePath=".\vector.h"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[simspark-cvs] simspark/spark simspark.sln,NONE,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1878

Added Files:
      Tag: WIN32
	simspark.sln 
Log Message:
- add vc2005 project files

--- NEW FILE: simspark.sln ---
(This appears to be a binary file; contents omitted.)

[simspark-cvs] simspark/spark/zeitgeist zeitgeist.cpp,1.1,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv643

Modified Files:
      Tag: WIN32
	zeitgeist.cpp 
Log Message:
- fix relpath for zeitgeist.rb (fix specific to simspark cvs repository)

Index: zeitgeist.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/zeitgeist.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** zeitgeist.cpp	5 Dec 2005 20:59:18 -0000	1.1
--- zeitgeist.cpp	9 Feb 2007 16:18:43 -0000	1.1.2.1
***************
*** 78,82 ****
          (
           "zeitgeist.rb",
!          "lib/zeitgeist",
           ScriptServer::IS_COMMON
           );
--- 78,82 ----
          (
           "zeitgeist.rb",
!          "zeitgeist",
           ScriptServer::IS_COMMON
           );

[simspark-cvs] simspark/spark/zeitgeist/scriptserver scriptserver.cpp, 1.2, 1.2.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32688

Modified Files:
      Tag: WIN32
	scriptserver.cpp 
Log Message:
- adapat path construction for init file sourcing

Index: scriptserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** scriptserver.cpp	16 May 2006 10:17:32 -0000	1.2
--- scriptserver.cpp	9 Feb 2007 16:17:40 -0000	1.2.2.1
***************
*** 23,26 ****
--- 23,27 ----
  #include <boost/scoped_array.hpp>
  #include <sstream>
+ #include <salt/fileclasses.h>
  #include "scriptserver.h"
  #include <zeitgeist/corecontext.h>
***************
*** 118,122 ****
  
      Class::TCmdProc cmd =
!         gMyPrivateContext->GetObject()->GetClass()->GetCmdProc
          (STR2CSTR(functionName));
  
--- 119,123 ----
  
      Class::TCmdProc cmd =
!         gMyPrivateContext->GetSelection()->GetClass()->GetCmdProc
          (STR2CSTR(functionName));
  
***************
*** 125,129 ****
      if (cmd != 0)
      {
!         out = cmd(static_cast<Object*>(gMyPrivateContext->GetObject().get()), in);
      } else
      {
--- 126,130 ----
      if (cmd != 0)
      {
!         out = cmd(static_cast<Object*>(gMyPrivateContext->GetSelection().get()), in);
      } else
      {
***************
*** 243,247 ****
      rb_define_global_function("dirs",         RUBY_METHOD_FUNC(dirs), 0);
  
!     mRelPathPrefix = "../../";
  }
  
--- 244,248 ----
      rb_define_global_function("dirs",         RUBY_METHOD_FUNC(dirs), 0);
  
!     mRelPathPrefix = string("..") + salt::PathSeparator + ".." + salt::PathSeparator;
  }
  
***************
*** 471,475 ****
  {
      // run the init script in the sourceDir
!     string sourcePath = sourceDir + "/" + name;
      GetLog()->Debug() << "(ScriptServer) Running " << sourcePath << "... ";
  
--- 472,476 ----
  {
      // run the init script in the sourceDir
!     string sourcePath = sourceDir + salt::PathSeparator + name;
      GetLog()->Debug() << "(ScriptServer) Running " << sourcePath << "... ";
  
***************
*** 494,498 ****
      }
  
!     string destPath = destDir + "/" + name;
  
      GetLog()->Normal() << "Copying " << sourcePath
--- 495,499 ----
      }
  
!     string destPath = destDir + salt::PathSeparator + name;
  
      GetLog()->Normal() << "Copying " << sourcePath
***************
*** 515,519 ****
      }
  
!     char* home = getenv("HOME");
      if (!home)
      {
--- 516,527 ----
      }
  
!     const char* envName =
! #ifdef WIN32
!         "USERPROFILE";
! #else
!         "HOME";
! #endif
! 
!     char* home = getenv(envName);
      if (!home)
      {
***************
*** 522,527 ****
      }
  
!     dotDir = string(home) + "/" + mDotName;
! 
      return true;
  }
--- 530,534 ----
      }
  
!     dotDir = string(home) + salt::PathSeparator + mDotName;
      return true;
  }
***************
*** 531,535 ****
--- 538,546 ----
  {
      char cwd[PATH_MAX+1];
+ #if WIN32
+     if (GetCurrentDirectory(PATH_MAX, cwd) == 0)
+ #else
      if (getcwd(cwd,sizeof(cwd)) == NULL)
+ #endif
      {
          GetLog()->Error()
***************
*** 538,542 ****
--- 549,557 ----
      }
  
+ #if WIN32
+     if (! SetCurrentDirectory(dotDir.c_str()))
+ #else
      if (chdir(dotDir.c_str()) == 0)
+ #endif
      {
          // dot dir exists; change back to original directory
***************
*** 546,550 ****
--- 561,569 ----
  
      // dot dir is not existent, try to create it
+ #if WIN32
+     if (! CreateDirectory(dotDir.c_str(), 0))
+ #else
      if (mkdir(dotDir.c_str(),0777) != 0)
+ #endif
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Cannot create directory '"
***************
*** 569,572 ****
--- 588,594 ----
          CreateDotDir(dotDir);
  
+ #ifdef WIN32
+     string pkgdatadir = "c:\\";
+ #else
      // some macro magic (not at all)
      string pkgdatadir = PREFIX "/share/" PACKAGE_NAME;
***************
*** 575,580 ****
      //std::cout << "pkgdatadir = " << pkgdatadir << std::endl;
      //std::cout << "filename = " << fileName << std::endl;
  
!     ERunScriptErrorType result;
  
      if (validDotDir)
--- 597,603 ----
      //std::cout << "pkgdatadir = " << pkgdatadir << std::endl;
      //std::cout << "filename = " << fileName << std::endl;
+ #endif
  
!     ERunScriptErrorType result = eNotFound;
  
      if (validDotDir)
***************
*** 586,627 ****
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << dotDir << "/" << fileName << "'\n";
          return true;
      }
!     
      if (result == eNotFound)
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << dotDir << "/" << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << dotDir << "/" << fileName << "'\n";
          return false;
      }
-     
  
!     // 
      result = RunInitScriptInternal(pkgdatadir,  fileName, validDotDir, dotDir);
!     
      if (result == eOK)
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << pkgdatadir << "/" << fileName << "'\n";
          return true;
      }
!     
      if (result == eNotFound)
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << pkgdatadir << "/" << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << pkgdatadir << "/" << fileName << "'\n";
!     }   
!     
  
      result = RunInitScriptInternal(mRelPathPrefix+relPath, fileName, validDotDir, dotDir);
--- 609,650 ----
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << dotDir << salt::PathSeparator << fileName << "'\n";
          return true;
      }
! 
      if (result == eNotFound)
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << dotDir << salt::PathSeparator << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << dotDir << salt::PathSeparator << fileName << "'\n";
          return false;
      }
  
! 
!     //
      result = RunInitScriptInternal(pkgdatadir,  fileName, validDotDir, dotDir);
! 
      if (result == eOK)
      {
          GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << pkgdatadir << salt::PathSeparator << fileName << "'\n";
          return true;
      }
! 
      if (result == eNotFound)
      {
          GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << pkgdatadir << salt::PathSeparator << fileName << "'\n";
      }
      else if (result == eError)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << pkgdatadir << salt::PathSeparator << fileName << "'\n";
!     }
! 
  
      result = RunInitScriptInternal(mRelPathPrefix+relPath, fileName, validDotDir, dotDir);
***************
*** 635,641 ****
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << mRelPathPrefix+relPath << "/" << fileName << "'\n";
      }
!     
      return (result == eOK);
  }
--- 658,664 ----
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << mRelPathPrefix+relPath << salt::PathSeparator << fileName << "'\n";
      }
! 
      return (result == eOK);
  }

[simspark-cvs] simspark/spark/zeitgeist/scriptserver rubywrapper.cpp, 1.1, 1.1.2.1 rubywrapper.h, 1.1, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32671

Modified Files:
      Tag: WIN32
	rubywrapper.cpp rubywrapper.h 
Log Message:
- rename recv to receiver in rbarguments (recv is a  windows macro)

Index: rubywrapper.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/rubywrapper.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** rubywrapper.h	5 Dec 2005 21:05:01 -0000	1.1
--- rubywrapper.h	9 Feb 2007 16:17:22 -0000	1.1.2.1
***************
*** 53,57 ****
      /** RbArguments is a structure that describes a ruby function
          call.
!         \param recv is the ruby object that receives the function call
          \param id is the ruby id of the receiver member function
          \param n is the number of parameters passed
--- 53,57 ----
      /** RbArguments is a structure that describes a ruby function
          call.
!         \param receiver is the ruby object that receives the function call
          \param id is the ruby id of the receiver member function
          \param n is the number of parameters passed
***************
*** 61,71 ****
      struct RbArguments
      {
!         VALUE recv;
          ID id;
          int n;
          VALUE *argv;
  
!         RbArguments(VALUE recv, ID id, int n, VALUE *argv) :
!             recv(recv), id(id), n(n), argv(argv) {};
      };
  
--- 61,71 ----
      struct RbArguments
      {
!         VALUE receiver;
          ID id;
          int n;
          VALUE *argv;
  
!         RbArguments(VALUE r, ID id, int n, VALUE *argv) :
!             receiver(r), id(id), n(n), argv(argv) {};
      };
  

Index: rubywrapper.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/rubywrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** rubywrapper.cpp	5 Dec 2005 21:05:01 -0000	1.1
--- rubywrapper.cpp	9 Feb 2007 16:17:21 -0000	1.1.2.1
***************
*** 25,29 ****
  {
      RbArguments &a = *reinterpret_cast<RbArguments*>(arg);
!     return rb_funcall2(a.recv, a.id, a.n, a.argv);
  }
  
--- 25,29 ----
  {
      RbArguments &a = *reinterpret_cast<RbArguments*>(arg);
!     return rb_funcall2(a.receiver, a.id, a.n, a.argv);
  }
  
***************
*** 56,60 ****
  void zeitgeist::RbPrintError()
  {
!   std::cout << RbGetError() << std::endl;
    rb_backtrace();
  }
--- 56,60 ----
  void zeitgeist::RbPrintError()
  {
!   std::cout << RbGetError().c_str() << std::endl;
    rb_backtrace();
  }

[simspark-cvs] simspark/spark/zeitgeist/randomserver randomserver.h, 1.1, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/randomserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32264

Modified Files:
      Tag: WIN32
	randomserver.h 
Log Message:
- fix includes

Index: randomserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/randomserver/randomserver.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** randomserver.h	5 Dec 2005 21:05:01 -0000	1.1
--- randomserver.h	9 Feb 2007 16:16:51 -0000	1.1.2.1
***************
*** 26,30 ****
--- 26,33 ----
  #include <salt/random.h>
  #include <zeitgeist/node.h>
+ 
+ #ifndef WIN32
  #include <sys/time.h>
+ #endif
  
  namespace zeitgeist

[simspark-cvs] simspark/spark/zeitgeist corecontext.h,1.1,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32233

Modified Files:
      Tag: WIN32
	corecontext.h 
Log Message:
- rename getobject to getselection; getobject was already defined as a macro in a windows header

Index: corecontext.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/corecontext.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** corecontext.h	5 Dec 2005 20:59:18 -0000	1.1
--- corecontext.h	9 Feb 2007 16:16:22 -0000	1.1.2.1
***************
*** 102,106 ****
  
      /** returns the currently selected object */
!     boost::shared_ptr<Leaf> GetObject() const { return mObject; }
  
      /** returns the core this context belongs to */
--- 102,106 ----
  
      /** returns the currently selected object */
!     boost::shared_ptr<Leaf> GetSelection() const { return mObject; }
  
      /** returns the core this context belongs to */

[simspark-cvs] simspark/spark/zeitgeist core.cpp,1.2,1.2.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31799

Modified Files:
      Tag: WIN32
	core.cpp 
Log Message:
- comment out signal handling implementation

Index: core.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** core.cpp	10 Mar 2006 00:16:06 -0000	1.2
--- core.cpp	9 Feb 2007 16:15:33 -0000	1.2.2.1
***************
*** 35,43 ****
  #include <salt/path.h>
  #include <salt/sharedlibrary.h>
- #include <execinfo.h>
  #include <signal.h>
  #include <iostream>
  #include <sstream>
  
  using namespace boost;
  using namespace salt;
--- 35,46 ----
  #include <salt/path.h>
  #include <salt/sharedlibrary.h>
  #include <signal.h>
  #include <iostream>
  #include <sstream>
  
+ #ifndef WIN32
+ #include <execinfo.h>
+ #endif
+ 
  using namespace boost;
  using namespace salt;
***************
*** 156,159 ****
--- 159,163 ----
  void Core::CatchSignal(int sig_num)
  {
+ #ifndef WIN32
      if (sig_num != SIGSEGV)
          {
***************
*** 201,204 ****
--- 205,209 ----
      cerr << "(Core) exit" << endl;
      exit(1);
+ #endif
  }
  

[simspark-cvs] simspark/spark/utility/sfsexp sexp.c,1.1,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility/sfsexp
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31761

Modified Files:
      Tag: WIN32
	sexp.c 
Log Message:
- fix snprintf definition

Index: sexp.c
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/sexp.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** sexp.c	19 Dec 2005 19:13:30 -0000	1.1
--- sexp.c	9 Feb 2007 16:15:16 -0000	1.1.2.1
***************
*** 38,41 ****
--- 38,45 ----
  #include "faststack.h"
  
+ #ifdef WIN32
+ #define snprintf _snprintf
+ #endif
+ 
  /**
   * Recursively walk an s-expression and free it.

[simspark-cvs] simspark/spark/utility/sfsexp malloc_util.c, 1.1, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility/sfsexp
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31361

Modified Files:
      Tag: WIN32
	malloc_util.c 
Log Message:
- msvc chokes on inline declararions for .c files?

Index: malloc_util.c
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/malloc_util.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** malloc_util.c	19 Dec 2005 19:13:30 -0000	1.1
--- malloc_util.c	9 Feb 2007 16:14:52 -0000	1.1.2.1
***************
*** 31,35 ****
  static int last_check = 0;
  
! static inline
  void set_alloc(int i, void *addr, size_t bytes, char *file, int lineno) {
      alloc_list[i].addr = addr;
--- 31,38 ----
  static int last_check = 0;
  
! static
! #ifndef _MSC_VER
! inline
! #endif
  void set_alloc(int i, void *addr, size_t bytes, char *file, int lineno) {
      alloc_list[i].addr = addr;

[simspark-cvs] simspark/spark/test/coretest main.cpp,1.2,1.2.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/test/coretest
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30756

Modified Files:
      Tag: WIN32
	main.cpp 
Log Message:
- source config.h to get PACKAGE_NAME

Index: main.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/test/coretest/main.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** main.cpp	10 Mar 2006 00:11:48 -0000	1.2
--- main.cpp	9 Feb 2007 16:12:43 -0000	1.2.2.1
***************
*** 20,23 ****
--- 20,27 ----
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+ #if HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ 
  #include <zeitgeist/zeitgeist.h>
  #include <oxygen/oxygen.h>
***************
*** 56,60 ****
  
          boost::shared_ptr<Leaf> selectedObject =
!           scriptServer->GetContext()->GetObject();
  
          cout << endl << selectedObject->GetFullPath() << "> ";
--- 60,64 ----
  
          boost::shared_ptr<Leaf> selectedObject =
!           scriptServer->GetContext()->GetSelection();
  
          cout << endl << selectedObject->GetFullPath() << "> ";

[simspark-cvs] simspark/spark/utility/sfsexp io.c,1.1,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility/sfsexp
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30782

Modified Files:
      Tag: WIN32
	io.c 
Log Message:
- fix includes fix _read () definition

Index: io.c
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/io.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** io.c	19 Dec 2005 19:13:30 -0000	1.1
--- io.c	9 Feb 2007 16:12:48 -0000	1.1.2.1
***************
*** 32,36 ****
--- 32,40 ----
  
  #include <fcntl.h>
+ 
+ #ifndef WIN32
  #include <unistd.h>
+ #endif
+ 
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 39,42 ****
--- 43,51 ----
  #include <assert.h>
  
+ #ifdef WIN32
+ #include <io.h>
+ #define read _read
+ #endif
+ 
  /**
   * initialize an io-wrapper

[simspark-cvs] simspark/spark/win32 config.h,NONE,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/win32
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30392

Added Files:
      Tag: WIN32
	config.h 
Log Message:
- add a win32 specific config.h

--- NEW FILE: config.h ---
/** this is a static (i.e. not auto generated) win32 specific
    configuration file
*/
#define PACKAGE_NAME "simspark"

[simspark-cvs] simspark/spark/salt vector.h,1.1,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/salt
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30002

Modified Files:
      Tag: WIN32
	vector.h 
Log Message:
- fix a static cast

Index: vector.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/salt/vector.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** vector.h	5 Dec 2005 20:56:00 -0000	1.1
--- vector.h	9 Feb 2007 16:11:04 -0000	1.1.2.1
***************
*** 70,74 ****
              }
  
!         return rad;
      }
  
--- 70,74 ----
              }
  
!         return static_cast<float>(rad);
      }
  

[simspark-cvs] simspark/spark/salt sharedlibrary.cpp,1.3,1.3.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/salt
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29924

Modified Files:
      Tag: WIN32
	sharedlibrary.cpp 
Log Message:
- implement shared library loading for the win32 platform

Index: sharedlibrary.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/salt/sharedlibrary.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** sharedlibrary.cpp	22 Jan 2006 12:13:08 -0000	1.3
--- sharedlibrary.cpp	9 Feb 2007 16:10:27 -0000	1.3.2.1
***************
*** 21,29 ****
  */
  #include "sharedlibrary.h"
- #include <dlfcn.h>
  #include <iostream>
  
  using namespace salt;
  
  bool
  SharedLibrary::Open(const std::string &libName)
--- 21,71 ----
  */
  #include "sharedlibrary.h"
  #include <iostream>
  
+ #ifdef WIN32
+ #include <windows.h>
+ #else
+ #include <dlfcn.h>
+ #endif
+ 
  using namespace salt;
  
+ #ifdef WIN32
+ 
+ bool SharedLibrary::Open(const std::string &libName)
+ {
+         if (mLibHandle)
+         {
+                 Close();
+         }
+ 
+ #if INIT_DEBUG
+     std::cerr << "(SharedLibrary) Opening " << libName + ".so\n";
+ #endif
+         mLibHandle = ::LoadLibrary((libName + ".dll").c_str());
+ 
+         return (mLibHandle!=NULL);
+ }
+ 
+ void* SharedLibrary::GetProcAddress(const std::string &procName)
+ {
+         if (mLibHandle)
+         {
+                 return ::GetProcAddress((HMODULE)mLibHandle, procName.c_str());
+         }
+         return NULL;
+ }
+ 
+ void SharedLibrary::Close()
+ {
+         if (mLibHandle)
+         {
+                 ::FreeLibrary((HMODULE)mLibHandle);
+                 mLibHandle = NULL;
+         }
+ }
+ 
+ #else
+ 
  bool
  SharedLibrary::Open(const std::string &libName)
***************
*** 75,76 ****
--- 117,120 ----
      return mName;
  }
+ 
+ #endif // WIN32

[simspark-cvs] simspark/spark/salt gmath.h,1.2,1.2.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/salt
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29507

Modified Files:
      Tag: WIN32
	gmath.h 
Log Message:
- define M_PI and M_PI_2

Index: gmath.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/salt/gmath.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** gmath.h	10 Feb 2006 10:12:19 -0000	1.2
--- gmath.h	9 Feb 2007 16:09:52 -0000	1.2.2.1
***************
*** 40,43 ****
--- 40,51 ----
  #endif
  
+ #ifndef M_PI
+     #define M_PI 3.1415926535897932384626433832795
+ #endif
+ 
+ #ifndef M_PI_2 
+     #define M_PI_2 1.57079632679489661923132169164 /* pi/2 */
+ #endif
+ 
  // better directly use the cmath constants
  static const double gPI          = M_PI;   // was ((float)3.1415926535);
***************
*** 159,163 ****
  f_inline TYPE gRadToDeg(TYPE rad)
  {
!     return (static_cast<TYPE>(rad)) * (180.0 / M_PI);
  }
  
--- 167,171 ----
  f_inline TYPE gRadToDeg(TYPE rad)
  {
!     return (static_cast<TYPE>(rad * (180.0 / M_PI)));
  }
  

[simspark-cvs] simspark/spark/salt fileclasses.h,1.1,1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/salt
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29373

Modified Files:
      Tag: WIN32
	fileclasses.h 
Log Message:
- define PATH_MAX for win32
- define platform dependent PathSeparator characters

Index: fileclasses.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/salt/fileclasses.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** fileclasses.h	5 Dec 2005 20:56:00 -0000	1.1
--- fileclasses.h	9 Feb 2007 16:09:07 -0000	1.1.2.1
***************
*** 39,45 ****
--- 39,59 ----
  #include <cstdlib>
  
+ #ifndef PATH_MAX
+ #define PATH_MAX 4096
+ #endif
+ 
  namespace salt
  {
  
+ /** Defines the native path separator character for the
+     platform
+ */
+ static const char* PathSeparator =
+ #ifdef WIN32
+    "\\";
+ #else
+   "/";
+ #endif
+ 
  /** RFile defines an interface and some basic support functions for
    * classes providing read only file services

[simspark-cvs] simspark/spark/win32 - New directory

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/win32
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21579/win32

Log Message:
Directory /cvsroot/simspark/simspark/spark/win32 added to the repository

[simspark-cvs] simspark/spark/kerosin/sceneserver/helper NVMeshMender.h,1.1,1.2

[Jan M. <ja...@us...>]

Update of /cvsroot/simspark/simspark/spark/kerosin/sceneserver/helper
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12512/spark/kerosin/sceneserver/helper

Modified Files:
	NVMeshMender.h 
Log Message:
- added patch for compiling with gcc 4.1
  thanks to Tobias Warden <wa...@pr...> for the patch



Index: NVMeshMender.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/helper/NVMeshMender.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NVMeshMender.h	5 Dec 2005 21:38:23 -0000	1.1
--- NVMeshMender.h	24 May 2006 10:07:10 -0000	1.2
***************
*** 236,240 ****
  		};
  
!         bool NVMeshMender::Munge( const NVMeshMender::VAVector& input, 
  			                   NVMeshMender::VAVector& output, 
  							   const float bSmoothCreaseAngleRadians = 3.141592654f / 3.0f,
--- 236,240 ----
  		};
  
!         bool Munge( const NVMeshMender::VAVector& input, 
  			                   NVMeshMender::VAVector& output, 
  							   const float bSmoothCreaseAngleRadians = 3.141592654f / 3.0f,
***************
*** 244,248 ****
                                 const Option _WeightNormalsByFaceSize = WeightNormalsByFaceSize
  							   );
! 		bool NVMeshMender::MungeD3DX( const NVMeshMender::VAVector& input, 
  			                   NVMeshMender::VAVector& output, 
  							   const float bSmoothCreaseAngleRadians = 3.141592654f / 3.0f,
--- 244,248 ----
                                 const Option _WeightNormalsByFaceSize = WeightNormalsByFaceSize
  							   );
! 		bool MungeD3DX( const NVMeshMender::VAVector& input, 
  			                   NVMeshMender::VAVector& output, 
  							   const float bSmoothCreaseAngleRadians = 3.141592654f / 3.0f,

[simspark-cvs] simspark/spark/oxygen/simulationserver netcontrol.h,1.1,1.2

[Jan M. <ja...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12512/spark/oxygen/simulationserver

Modified Files:
	netcontrol.h 
Log Message:
- added patch for compiling with gcc 4.1
  thanks to Tobias Warden <wa...@pr...> for the patch



Index: netcontrol.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netcontrol.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** netcontrol.h	5 Dec 2005 21:21:18 -0000	1.1
--- netcontrol.h	24 May 2006 10:07:10 -0000	1.2
***************
*** 122,131 ****
      /** create a socket according to the given ESocketType */
      static boost::shared_ptr<rcss::net::Socket>
!     NetControl::CreateSocket(ESocketType type);
  
  protected:
      /** returns a human readable description of the socket type and
          port*/
!     std::string NetControl::DescribeSocketType();
  
      /** checks for and accepts pending TCP connections */
--- 122,131 ----
      /** create a socket according to the given ESocketType */
      static boost::shared_ptr<rcss::net::Socket>
!     CreateSocket(ESocketType type);
  
  protected:
      /** returns a human readable description of the socket type and
          port*/
!     std::string DescribeSocketType();
  
      /** checks for and accepts pending TCP connections */
***************
*** 133,137 ****
  
      /** reads and stores all available messages */
!     void NetControl::ReadMessages();
  
      /** reads and stores all available TCP messages */
--- 133,137 ----
  
      /** reads and stores all available messages */
!     void ReadMessages();
  
      /** reads and stores all available TCP messages */

[simspark-cvs] simspark/spark/oxygen/gamecontrolserver predicate.h,1.1,1.2

[Jan M. <ja...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12512/spark/oxygen/gamecontrolserver

Modified Files:
	predicate.h 
Log Message:
- added patch for compiling with gcc 4.1
  thanks to Tobias Warden <wa...@pr...> for the patch



Index: predicate.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/predicate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** predicate.h	5 Dec 2005 21:16:49 -0000	1.1
--- predicate.h	24 May 2006 10:07:10 -0000	1.2
***************
*** 72,76 ****
          /** constructs an Iterator pointing to the first element of
              list l */
!         Iterator::Iterator(const zeitgeist::ParameterList* l);
  
          /** constructs an Iterator pointing to the first element of
--- 72,76 ----
          /** constructs an Iterator pointing to the first element of
              list l */
!         Iterator(const zeitgeist::ParameterList* l);
  
          /** constructs an Iterator pointing to the first element of

[simspark-cvs] simspark/spark/zeitgeist/scriptserver scriptserver.h,1.1,1.2 scriptserver.cpp,1.1,1.2

[Jan M. <ja...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31198

Modified Files:
	scriptserver.h scriptserver.cpp 
Log Message:
- added enum returntype for running init scripts
- RunInitScript distinguishes between faulty and missing scripts now.
  user local scripts are NOT overwritten if they contain errors. If they
  are missing, the global scripts are still installed.
- Error/Debug messages make more sense now
- RunInitScriptInternal returns error type instead of boolean value now



Index: scriptserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scriptserver.cpp	5 Dec 2005 21:05:01 -0000	1.1
--- scriptserver.cpp	16 May 2006 10:17:32 -0000	1.2
***************
*** 466,470 ****
  }
  
! bool
  ScriptServer::RunInitScriptInternal(const string &sourceDir, const string &name,
                                      bool copy, const string& destDir)
--- 466,470 ----
  }
  
! ScriptServer::ERunScriptErrorType
  ScriptServer::RunInitScriptInternal(const string &sourceDir, const string &name,
                                      bool copy, const string& destDir)
***************
*** 475,485 ****
  
      shared_ptr<salt::StdFile> file(new(salt::StdFile));
!     if (
!         (! file->Open(sourcePath.c_str())) ||
!         (! Run(file))
!         )
      {
!         GetLog()->Debug() << "failed" << endl;
!         return false;
      } else
      {
--- 475,486 ----
  
      shared_ptr<salt::StdFile> file(new(salt::StdFile));
!     if (! file->Open(sourcePath.c_str()))
      {
!         GetLog()->Debug() << "failed (script not found)" << endl;
!         return eNotFound;
!     } else if (! Run(file))
!     {
!         GetLog()->Debug() << "failed (error in script" << endl;
!         return eError;
      } else
      {
***************
*** 490,494 ****
      if (! copy)
      {
!         return true;
      }
  
--- 491,495 ----
      if (! copy)
      {
!         return eOK;
      }
  
***************
*** 502,506 ****
      system(s.str().c_str());
  
!     return true;
  }
  
--- 503,507 ----
      system(s.str().c_str());
  
!     return eOK;
  }
  
***************
*** 571,590 ****
      string pkgdatadir = PREFIX "/share/" PACKAGE_NAME;
  
!     bool ok =
!         (
!             (
!                 (validDotDir) && (RunInitScriptInternal(dotDir, fileName, false))
!                 )
!             || (RunInitScriptInternal(pkgdatadir,  fileName, validDotDir, dotDir))
!             || (RunInitScriptInternal(mRelPathPrefix+relPath, fileName, validDotDir, dotDir))
!             );
  
!     if (! ok)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Cannot locate init script '"
                            << fileName << "'\n";
      }
! 
!     return ok;
  }
  
--- 572,642 ----
      string pkgdatadir = PREFIX "/share/" PACKAGE_NAME;
  
!     //std::cout << "dotDir = " << dotDir << std::endl;
!     //std::cout << "pkgdatadir = " << pkgdatadir << std::endl;
!     //std::cout << "filename = " << fileName << std::endl;
  
!     ERunScriptErrorType result;
! 
!     if (validDotDir)
!     {
!         result = RunInitScriptInternal(dotDir, fileName, false);
!     }
! 
!     if (result == eOK)
!     {
!         GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << dotDir << "/" << fileName << "'\n";
!         return true;
!     }
!     
!     if (result == eNotFound)
!     {
!         GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << dotDir << "/" << fileName << "'\n";
!     }
!     else if (result == eError)
!     {
!         GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << dotDir << "/" << fileName << "'\n";
!         return false;
!     }
!     
! 
!     // 
!     result = RunInitScriptInternal(pkgdatadir,  fileName, validDotDir, dotDir);
!     
!     if (result == eOK)
!     {
!         GetLog()->Debug() << "(ScriptServer) : Ran init script '"
!                           << pkgdatadir << "/" << fileName << "'\n";
!         return true;
!     }
!     
!     if (result == eNotFound)
!     {
!         GetLog()->Debug() << "(ScriptServer) : Did not find init script '"
!                           << pkgdatadir << "/" << fileName << "'\n";
!     }
!     else if (result == eError)
!     {
!         GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << pkgdatadir << "/" << fileName << "'\n";
!     }   
!     
! 
!     result = RunInitScriptInternal(mRelPathPrefix+relPath, fileName, validDotDir, dotDir);
! 
!     if (result == eNotFound)
      {
          GetLog()->Error() << "(ScriptServer) ERROR: Cannot locate init script '"
                            << fileName << "'\n";
      }
!     else if (result == eError)
!     {
!         GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
!                           << mRelPathPrefix+relPath << "/" << fileName << "'\n";
!     }
!     
!     return (result == eOK);
  }
  

Index: scriptserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scriptserver.h	5 Dec 2005 21:05:01 -0000	1.1
--- scriptserver.h	16 May 2006 10:17:32 -0000	1.2
***************
*** 62,65 ****
--- 62,73 ----
          };
  
+     enum ERunScriptErrorType
+     {
+         eOK,       // no errors
+         eNotFound, // could not find script
+         eError    // some error occured while executing the script
+     };
+ 
+ 
  protected:
  private:
***************
*** 162,167 ****
  
      /** private helper function */
!     bool RunInitScriptInternal(const std::string &dir, const std::string &name,
!                                bool copy,  const std::string& destDir = "");
  
      /** construct the path of the local dot directory that contains
--- 170,175 ----
  
      /** private helper function */
!     ERunScriptErrorType RunInitScriptInternal(const std::string &dir, const std::string &name,
!                                               bool copy,  const std::string& destDir = "");
  
      /** construct the path of the local dot directory that contains

[simspark-cvs] simspark/spark/oxygen/physicsserver body_c.cpp,1.1,1.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15585/physicsserver

Modified Files:
	body_c.cpp 
Log Message:


Index: body_c.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/body_c.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** body_c.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- body_c.cpp	14 Apr 2006 16:27:57 -0000	1.2
***************
*** 359,362 ****
--- 359,377 ----
  }
  
+ FUNCTION(Body,translateMass)
+ {
+     Vector3f inV;
+ 
+     if (
+         (in.GetSize() == 0) ||
+         (! in.GetValue(in.begin(), inV))
+         )
+         {
+             return false;
+         }
+ 
+     obj->TranslateMass(inV);
+     return true;
+ }
  
  void CLASS(Body)::DefineClass()
***************
*** 383,385 ****
--- 398,401 ----
          DEFINE_FUNCTION(setPosition);
          DEFINE_FUNCTION(setMassParameters);
+         DEFINE_FUNCTION(translateMass);
  }

[simspark-cvs] simspark/spark/oxygen Makefile.am,1.2,1.3 oxygen.h,1.1,1.2 oxygen.cpp,1.1,1.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13309

Modified Files:
	Makefile.am oxygen.h oxygen.cpp 
Log Message:
- implemented support for the ODE transfom geom. This geom allows the
displacement of a geom relative to the associated body. This allows to
attach more than one geom to a body in a meaningful way to construct
composite bodies

- added method TranslateMass() to Body. This method translates the mass
center of the body relativ to the body frame


Index: oxygen.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/oxygen.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** oxygen.h	5 Dec 2005 21:16:49 -0000	1.1
--- oxygen.h	14 Apr 2006 16:27:26 -0000	1.2
***************
*** 37,40 ****
--- 37,41 ----
  #include "physicsserver/dragcontroller.h"
  #include "physicsserver/velocitycontroller.h"
+ #include "physicsserver/transformcollider.h"
  #include "physicsserver/boxcollider.h"
  #include "physicsserver/ccylindercollider.h"

Index: oxygen.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/oxygen.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** oxygen.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- oxygen.cpp	14 Apr 2006 16:27:26 -0000	1.2
***************
*** 68,71 ****
--- 68,72 ----
      // collider
      zg.GetCore()->RegisterClassObject(new CLASS(Collider), "oxygen/");
+     zg.GetCore()->RegisterClassObject(new CLASS(TransformCollider), "oxygen/");
      zg.GetCore()->RegisterClassObject(new CLASS(BoxCollider), "oxygen/");
      zg.GetCore()->RegisterClassObject(new CLASS(CCylinderCollider), "oxygen/");

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	8 Mar 2006 17:02:33 -0000	1.2
--- Makefile.am	14 Apr 2006 16:27:26 -0000	1.3
***************
*** 69,72 ****
--- 69,74 ----
  physicsserver/bodycontroller.cpp \
  physicsserver/bodycontroller_c.cpp \
+ physicsserver/transformcollider.cpp \
+ physicsserver/transformcollider_c.cpp \
  physicsserver/boxcollider.cpp \
  physicsserver/boxcollider_c.cpp \