From 62c6cba2a18c79e7c71ac7fb783f22a697602a93 Mon Sep 17 00:00:00 2001 From: Cirilo Bernardo Date: Sun, 3 Jan 2016 10:06:28 +1100 Subject: [PATCH] Reorganizing VRML parser code --- plugins/3d/vrml/CMakeLists.txt | 8 ++++++-- plugins/3d/vrml/{v2 => }/wrlproc.cpp | 0 plugins/3d/vrml/{v2 => }/wrlproc.h | 0 plugins/3d/vrml/{v2 => }/wrltypes.h | 0 4 files changed, 6 insertions(+), 2 deletions(-) rename plugins/3d/vrml/{v2 => }/wrlproc.cpp (100%) rename plugins/3d/vrml/{v2 => }/wrlproc.h (100%) rename plugins/3d/vrml/{v2 => }/wrltypes.h (100%) diff --git a/plugins/3d/vrml/CMakeLists.txt b/plugins/3d/vrml/CMakeLists.txt index 9f496cc03c..cb5655715d 100644 --- a/plugins/3d/vrml/CMakeLists.txt +++ b/plugins/3d/vrml/CMakeLists.txt @@ -1,10 +1,14 @@ -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/v2 ) +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/v2 +) #add_definitions( -DDEBUG_VRML2=3 ) +#add_definitions( -DDEBUG_VRML1=3 ) add_library( s3d_plugin_vrml MODULE vrml.cpp - v2/wrlproc.cpp + wrlproc.cpp v2/vrml2_node.cpp v2/vrml2_base.cpp v2/vrml2_transform.cpp diff --git a/plugins/3d/vrml/v2/wrlproc.cpp b/plugins/3d/vrml/wrlproc.cpp similarity index 100% rename from plugins/3d/vrml/v2/wrlproc.cpp rename to plugins/3d/vrml/wrlproc.cpp diff --git a/plugins/3d/vrml/v2/wrlproc.h b/plugins/3d/vrml/wrlproc.h similarity index 100% rename from plugins/3d/vrml/v2/wrlproc.h rename to plugins/3d/vrml/wrlproc.h diff --git a/plugins/3d/vrml/v2/wrltypes.h b/plugins/3d/vrml/wrltypes.h similarity index 100% rename from plugins/3d/vrml/v2/wrltypes.h rename to plugins/3d/vrml/wrltypes.h