simspark-cvs

[Oliver O. <fr...@us...>]

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

Modified Files:
	rubysceneimporter.cpp rubysceneimporter.h 
Added Files:
	rubysceneimporter.vcproj 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

--- NEW FILE: rubysceneimporter.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="rubysceneimporter"
	ProjectGUID="{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}"
	RootNamespace="rubysceneimporter"
	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"
				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="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="VCRelease|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"
				AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_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="VCLinkerTool"
				AdditionalDependencies="msvcrt-ruby18.lib"
				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=".\rubysceneimporter.cpp"
			>
		</File>
		<File
			RelativePath=".\rubysceneimporter.h"
			>
		</File>
		<File
			RelativePath=".\rubysceneimporter_c.cpp"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: rubysceneimporter.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rubysceneimporter.h	18 Dec 2005 17:53:56 -0000	1.2
--- rubysceneimporter.h	15 Mar 2007 07:26:28 -0000	1.3
***************
*** 50,54 ****
          TMethodInvocationList invocationList;
  
!         ParamEnv();
          ParamEnv(boost::shared_ptr<zeitgeist::ParameterList> p)
              : parameter(p) {};
--- 50,54 ----
          TMethodInvocationList invocationList;
  
!         ParamEnv() {};
          ParamEnv(boost::shared_ptr<zeitgeist::ParameterList> p)
              : parameter(p) {};
***************
*** 112,119 ****
  
      /** the major version of the scen graph file */
!     float mVersionMajor;
  
      /** the minor version of the scen graph file */
!     float mVersionMinor;
  
      /** the last supplied fileName */
--- 112,119 ----
  
      /** the major version of the scen graph file */
!     int mVersionMajor;
  
      /** the minor version of the scen graph file */
!     int mVersionMinor;
  
      /** the last supplied fileName */

Index: rubysceneimporter.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rubysceneimporter.cpp	18 Dec 2005 17:53:56 -0000	1.2
--- rubysceneimporter.cpp	15 Mar 2007 07:26:28 -0000	1.3
***************
*** 114,118 ****
  {
      mFileName = S_FROMSTRING;
!     return ParseScene(scene.c_str(),scene.size(),root,parameter);
  }
  
--- 114,118 ----
  {
      mFileName = S_FROMSTRING;
!     return ParseScene(scene.c_str(),static_cast<int>(scene.size()),root,parameter);
  }
  
***************
*** 345,349 ****
      int idx = (*iter).second;
  
!     if (idx >= env.parameter->GetSize())
          {
              GetLog()->Error()
--- 345,352 ----
      int idx = (*iter).second;
  
!     if (
!         (idx < 0) ||
!         (idx >= env.parameter->GetSize())
!         )
          {
              GetLog()->Error()
***************
*** 535,538 ****
--- 538,543 ----
              Invoke(invoc);
          }
+ 
+     return true;
  }
  
***************
*** 643,647 ****
              // create a new variable
              env.parameter->AddValue(value);
!             env.parameterMap[varname] = (env.parameterMap.size() - 1);
          } else
          {
--- 648,653 ----
              // create a new variable
              env.parameter->AddValue(value);
!             int idx = (static_cast<int>(env.parameterMap.size()));
!             env.parameterMap[varname] = idx;
          } else
          {
***************
*** 699,703 ****
                  }
  
!             int idx = env.parameterMap.size();
              env.parameterMap[param] = idx;
              sexp = sexp->next;
--- 705,709 ----
                  }
  
!             int idx = static_cast<int>(env.parameterMap.size());
              env.parameterMap[param] = idx;
              sexp = sexp->next;