|
From: <br...@us...> - 2008-09-16 04:22:35
|
Revision: 3628
http://openvrml.svn.sourceforge.net/openvrml/?rev=3628&view=rev
Author: braden
Date: 2008-09-16 04:22:45 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Moved VRML97 node implementations to a static library in the Visual C++ solution.
Modified Paths:
--------------
trunk/ChangeLog
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
Added Paths:
-----------
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-16 02:22:37 UTC (rev 3627)
+++ trunk/ChangeLog 2008-09-16 04:22:45 UTC (rev 3628)
@@ -1,3 +1,12 @@
+2008-09-16 Braden McDaniel <br...@en...>
+
+ Moved VRML97 node implementations to a static library in the
+ Visual C++ solution.
+
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
+ * ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
+
2008-09-15 Braden McDaniel <br...@en...>
Define BOOST_SPIRIT_THREADSAFE, BOOST_SPIRIT_CLOSURE_LIMIT, and
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-16 02:22:37 UTC (rev 3627)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln 2008-09-16 04:22:45 UTC (rev 3628)
@@ -1,6 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B} = {5ED398C0-0529-40D5-AB2C-C7EF0769002B}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-gl", "openvrml-gl\openvrml-gl.vcproj", "{141F90C2-6630-4D7A-834F-D5D57C6CFC24}"
ProjectSection(ProjectDependencies) = postProject
@@ -34,6 +37,8 @@
{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vrml97", "vrml97\vrml97.vcproj", "{5ED398C0-0529-40D5-AB2C-C7EF0769002B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -68,6 +73,10 @@
{EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Debug|Win32.Build.0 = Debug|Win32
{EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Release|Win32.ActiveCfg = Release|Win32
{EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Release|Win32.Build.0 = Release|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Debug|Win32.Build.0 = Debug|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Release|Win32.ActiveCfg = Release|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-09-16 02:22:37 UTC (rev 3627)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-09-16 04:22:45 UTC (rev 3628)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\""
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\""
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -127,7 +127,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -191,22 +191,6 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\anchor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\appearance.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\audio_clip.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\background.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\basetypes.cpp"
>
<FileConfiguration
@@ -219,18 +203,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\billboard.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\bounding_volume.cpp"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\box.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\browser.cpp"
>
<FileConfiguration
@@ -244,54 +220,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\cad_assembly.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\cad_layer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\collision.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\color.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\color_interpolator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\cone.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\coordinate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\coordinate_interpolator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\cylinder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\cylinder_sensor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\directional_light.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\elevation_grid.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.cpp"
>
</File>
@@ -300,66 +228,14 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\extrusion.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\field_value.cpp"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\fog.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\font_style.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\frustum.cpp"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\group.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\image_stream_listener.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\image_texture.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\indexed_face_set.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\indexed_line_set.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\inline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\lod.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\material.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\movie_texture.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\navigation_info.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\node.cpp"
>
</File>
@@ -368,42 +244,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\normal.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\normal_interpolator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\orientation_interpolator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\pixel_texture.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\plane_sensor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\point_light.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\point_set.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\position_interpolator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\proximity_sensor.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.cpp"
>
</File>
@@ -412,74 +252,14 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\scalar_interpolator.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.cpp"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\shape.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\sound.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\sphere.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\sphere_sensor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\spot_light.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\switch.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\text.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\texture_coordinate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\texture_transform.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\time_sensor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\touch_sensor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\transform.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\viewer.cpp"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\viewpoint.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\visibility_sensor.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\vrml97_grammar.cpp"
>
</File>
@@ -491,7 +271,6 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/bigobj"
AdditionalIncludeDirectories="..\..\..\..\..\src\node"
MinimalRebuild="false"
DebugInformationFormat="1"
@@ -509,10 +288,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\world_info.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_cad_geometry.cpp"
>
</File>
@@ -582,106 +357,22 @@
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\abstract_indexed_set.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\abstract_light.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\abstract_texture.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\anchor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\appearance.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\audio_clip.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\background.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\basetypes.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\billboard.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\bounding_volume.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\box.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\browser.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\cad_assembly.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\cad_layer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\collision.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\color.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\color_interpolator.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\common.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\cone.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\coordinate.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\coordinate_interpolator.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\cylinder.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\cylinder_sensor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\directional_light.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\elevation_grid.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.h"
>
</File>
@@ -690,70 +381,14 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\extrusion.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\field_value.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\fog.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\font_style.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\frustum.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\group.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\grouping_node_base.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\image_stream_listener.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\image_texture.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\indexed_face_set.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\indexed_line_set.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\inline.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\lod.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\material.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\movie_texture.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\navigation_info.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\node.h"
>
</File>
@@ -762,14 +397,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\normal.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\normal_interpolator.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml-common.h"
>
</File>
@@ -778,38 +405,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\orientation_interpolator.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\pixel_texture.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\plane_sensor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\point_light.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\point_set.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\position_interpolator.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\private.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\proximity_sensor.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.h"
>
</File>
@@ -818,10 +417,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\scalar_interpolator.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.h"
>
</File>
@@ -830,66 +425,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\shape.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\sound.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\sphere.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\sphere_sensor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\spot_light.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\switch.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\text.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\texture_coordinate.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\texture_transform.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\time_sensor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\touch_sensor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\transform.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\viewer.h"
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\viewpoint.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\..\src\node\vrml97\visibility_sensor.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\vrml97_grammar.h"
>
</File>
@@ -898,10 +437,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\src\node\vrml97\world_info.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_cad_geometry.h"
>
</File>
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
vrml97.vcproj.*.user
Added: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj (rev 0)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj 2008-09-16 04:22:45 UTC (rev 3628)
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="vrml97"
+ ProjectGUID="{5ED398C0-0529-40D5-AB2C-C7EF0769002B}"
+ RootNamespace="vrml97"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_FT_CONST="const";OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4250;4251;4275;4355;4800"
+ />
+ <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="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_FT_CONST="const";OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4250;4251;4275;4355;4800"
+ />
+ <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="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\anchor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\appearance.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\audio_clip.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\background.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\billboard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\box.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cad_assembly.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cad_layer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\collision.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\color.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\color_interpolator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cone.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\coordinate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\coordinate_interpolator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cylinder.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cylinder_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\directional_light.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\elevation_grid.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\extrusion.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\fog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\font_style.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\group.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\image_stream_listener.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\image_texture.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\indexed_face_set.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\indexed_line_set.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\inline.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\lod.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\material.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\movie_texture.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\navigation_info.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\normal.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\normal_interpolator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\orientation_interpolator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\pixel_texture.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\plane_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\point_light.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\point_set.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\position_interpolator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\proximity_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\scalar_interpolator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\shape.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\sound.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\sphere.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\sphere_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\spot_light.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\switch.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\text.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\texture_coordinate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\texture_transform.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\time_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\touch_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\transform.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\viewpoint.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\visibility_sensor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\world_info.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\abstract_indexed_set.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\abstract_light.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\abstract_texture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\anchor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\appearance.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\audio_clip.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\background.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\billboard.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\box.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cad_assembly.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cad_layer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\collision.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\color.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\color_interpolator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cone.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\coordinate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\coordinate_interpolator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cylinder.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\cylinder_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\directional_light.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\elevation_grid.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\extrusion.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\fog.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\font_style.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\group.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\grouping_node_base.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\image_stream_listener.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\image_texture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\indexed_face_set.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\indexed_line_set.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\inline.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\lod.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\material.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\movie_texture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\navigation_info.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\normal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\normal_interpolator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\orientation_interpolator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\pixel_texture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\plane_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\point_light.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\point_set.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\position_interpolator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\proximity_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\scalar_interpolator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\shape.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\sound.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\sphere.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\sphere_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\spot_light.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\switch.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\text.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\texture_coordinate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\texture_transform.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\time_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\touch_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\transform.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\viewpoint.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\visibility_sensor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\node\vrml97\world_info.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ CRLF
Modified: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2008-09-16 02:22:37 UTC (rev 3627)
+++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2008-09-16 04:22:45 UTC (rev 3628)
@@ -2564,6 +2564,7 @@
if (!this->select_mode) {
glid = glGenLists(1);
+ std::cerr << "do_insert_extrusion: glid = " << glid << std::endl;
glNewList(glid, GL_COMPILE_AND_EXECUTE);
}
@@ -2789,9 +2790,10 @@
OPENVRML_GL_LOCAL void insertShellConvex(ShellData * const s)
{
using openvrml::vec3f;
+ using openvrml::make_vec3f;
using openvrml::gl::viewer;
- vec3f N;
+ vec3f N = make_vec3f();
size_t i, nf = 0; // Number of faces
for (i = 0; i < s->coordIndex.size(); ++i) {
@@ -3195,6 +3197,7 @@
if (!this->select_mode) {
glid = glGenLists(1);
+ std::cerr << "do_insert_sphere: glid = " << glid << std::endl;
glNewList(glid, GL_COMPILE_AND_EXECUTE);
}
@@ -3810,7 +3813,7 @@
glMatrixMode(GL_PROJECTION);
if (!this->select_mode) { glLoadIdentity(); }
- (field_of_view *= 180.0) /= pi;
+ (field_of_view *= 180.0) /= float(pi);
const float aspect = float(this->win_width) / this->win_height;
const float znear = (avatar_size > 0.0)
? float(0.5 * avatar_size)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|