fernandotonon · fernandotonon · Jan 12, 2023 · Jan 12, 2023 · Jan 12, 2023
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/dependencies/ogre-procedural"]
+	path = src/dependencies/ogre-procedural
+	url = https://github.com/OGRECave/ogre-procedural.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,12 +71,6 @@ endif()
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/;${CMAKE_MODULE_PATH}")
 
-##############################################################
-#  Find OgreProcedural
-##############################################################
-find_package(OgreProcedural REQUIRED)
-include_directories(${OgreProcedural_INCLUDE_DIRS})
-
 ##############################################################
 #  Find Ogre
 ##############################################################

diff --git a/CMakeModules/FindOgreProcedural.cmake b/CMakeModules/FindOgreProcedural.cmake
diff --git a/media/materials/programs/AmbientOneTexture.glsl b/media/materials/programs/AmbientOneTexture.glsl
diff --git a/media/materials/programs/Example_Basic.cg b/media/materials/programs/Example_Basic.cg
diff --git a/media/materials/programs/GLSL/DiffuseOneTexture.glsl b/media/materials/programs/GLSL/DiffuseOneTexture.glsl
diff --git a/media/materials/programs/GLSL/PassthroughFP.glsl b/media/materials/programs/GLSL/PassthroughFP.glsl
diff --git a/media/materials/programs/GLSL/skinningTwoWeightsShadowCasterVp.glsl b/media/materials/programs/GLSL/skinningTwoWeightsShadowCasterVp.glsl
diff --git a/media/materials/programs/GLSL150/ASCIIFP.glsl b/media/materials/programs/GLSL150/ASCIIFP.glsl
diff --git a/media/materials/programs/GLSL150/AmbientOneTexture.glsl b/media/materials/programs/GLSL150/AmbientOneTexture.glsl
diff --git a/media/materials/programs/GLSL150/AmbientOneTextureWithUV.glsl b/media/materials/programs/GLSL150/AmbientOneTextureWithUV.glsl
diff --git a/media/materials/programs/GLSL150/Bloom2_ps20.glsl b/media/materials/programs/GLSL150/Bloom2_ps20.glsl
diff --git a/media/materials/programs/GLSL150/Blur0_vs.glsl b/media/materials/programs/GLSL150/Blur0_vs.glsl
diff --git a/media/materials/programs/GLSL150/Blur1_vs.glsl b/media/materials/programs/GLSL150/Blur1_vs.glsl
diff --git a/media/materials/programs/GLSL150/BlurH_ps20.glsl b/media/materials/programs/GLSL150/BlurH_ps20.glsl
diff --git a/media/materials/programs/GLSL150/BlurV_ps20.glsl b/media/materials/programs/GLSL150/BlurV_ps20.glsl
diff --git a/media/materials/programs/GLSL150/Blur_ps.glsl b/media/materials/programs/GLSL150/Blur_ps.glsl
diff --git a/media/materials/programs/GLSL150/Blur_vs.glsl b/media/materials/programs/GLSL150/Blur_vs.glsl
diff --git a/media/materials/programs/GLSL150/BrightBloom2_ps20.glsl b/media/materials/programs/GLSL150/BrightBloom2_ps20.glsl
diff --git a/media/materials/programs/GLSL150/BumpMapVPTangentParity.glsl b/media/materials/programs/GLSL150/BumpMapVPTangentParity.glsl
diff --git a/media/materials/programs/GLSL150/ColdCasterFp.glsl b/media/materials/programs/GLSL150/ColdCasterFp.glsl
diff --git a/media/materials/programs/GLSL150/ColdCasterVp.glsl b/media/materials/programs/GLSL150/ColdCasterVp.glsl
diff --git a/media/materials/programs/GLSL150/Combine_fp.glsl b/media/materials/programs/GLSL150/Combine_fp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowObjectFp.glsl b/media/materials/programs/GLSL150/DepthShadowObjectFp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowObjectVp.glsl b/media/materials/programs/GLSL150/DepthShadowObjectVp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowmapCasterFp.glsl b/media/materials/programs/GLSL150/DepthShadowmapCasterFp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowmapCasterVp.glsl b/media/materials/programs/GLSL150/DepthShadowmapCasterVp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowmapNormalMapReceiverFp.glsl b/media/materials/programs/GLSL150/DepthShadowmapNormalMapReceiverFp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowmapNormalMapReceiverVp.glsl b/media/materials/programs/GLSL150/DepthShadowmapNormalMapReceiverVp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowmapReceiverFp.glsl b/media/materials/programs/GLSL150/DepthShadowmapReceiverFp.glsl
diff --git a/media/materials/programs/GLSL150/DepthShadowmapReceiverVp.glsl b/media/materials/programs/GLSL150/DepthShadowmapReceiverVp.glsl
diff --git a/media/materials/programs/GLSL150/DiffuseOneTexture.glsl b/media/materials/programs/GLSL150/DiffuseOneTexture.glsl
diff --git a/media/materials/programs/GLSL150/DitherFP.glsl b/media/materials/programs/GLSL150/DitherFP.glsl
diff --git a/media/materials/programs/GLSL150/DualQuaternion.glsl b/media/materials/programs/GLSL150/DualQuaternion.glsl
diff --git a/media/materials/programs/GLSL150/DualQuaternion_Common.glsl b/media/materials/programs/GLSL150/DualQuaternion_Common.glsl
diff --git a/media/materials/programs/GLSL150/DualQuaternion_ShadowCaster.glsl b/media/materials/programs/GLSL150/DualQuaternion_ShadowCaster.glsl
diff --git a/media/materials/programs/GLSL150/DualQuaternion_TwoPhase.glsl b/media/materials/programs/GLSL150/DualQuaternion_TwoPhase.glsl
diff --git a/media/materials/programs/GLSL150/DualQuaternion_TwoPhaseShadowCaster.glsl b/media/materials/programs/GLSL150/DualQuaternion_TwoPhaseShadowCaster.glsl
diff --git a/media/materials/programs/GLSL150/Dyn-TextFP.glsl b/media/materials/programs/GLSL150/Dyn-TextFP.glsl
diff --git a/media/materials/programs/GLSL150/Dyn-TextVP.glsl b/media/materials/programs/GLSL150/Dyn-TextVP.glsl
diff --git a/media/materials/programs/GLSL150/EmbossedFp.glsl b/media/materials/programs/GLSL150/EmbossedFp.glsl
diff --git a/media/materials/programs/GLSL150/Example_BumpMappingFp.glsl b/media/materials/programs/GLSL150/Example_BumpMappingFp.glsl
diff --git a/media/materials/programs/GLSL150/Example_BumpMappingShadowRcvFp.glsl b/media/materials/programs/GLSL150/Example_BumpMappingShadowRcvFp.glsl
diff --git a/media/materials/programs/GLSL150/Example_BumpMappingShadowRcvVp.glsl b/media/materials/programs/GLSL150/Example_BumpMappingShadowRcvVp.glsl
diff --git a/media/materials/programs/GLSL150/Example_BumpMappingSpecularFp.glsl b/media/materials/programs/GLSL150/Example_BumpMappingSpecularFp.glsl
diff --git a/media/materials/programs/GLSL150/Example_BumpMappingSpecularVp.glsl b/media/materials/programs/GLSL150/Example_BumpMappingSpecularVp.glsl
diff --git a/media/materials/programs/GLSL150/Example_BumpMappingVp.glsl b/media/materials/programs/GLSL150/Example_BumpMappingVp.glsl
diff --git a/media/materials/programs/GLSL150/Example_CelShadingFp.glsl b/media/materials/programs/GLSL150/Example_CelShadingFp.glsl
diff --git a/media/materials/programs/GLSL150/Example_CelShadingVp.glsl b/media/materials/programs/GLSL150/Example_CelShadingVp.glsl
diff --git a/media/materials/programs/GLSL150/Example_FresnelFp.glsl b/media/materials/programs/GLSL150/Example_FresnelFp.glsl
diff --git a/media/materials/programs/GLSL150/Example_FresnelVp.glsl b/media/materials/programs/GLSL150/Example_FresnelVp.glsl
diff --git a/media/materials/programs/GLSL150/Example_TextureArrayPS.glsl b/media/materials/programs/GLSL150/Example_TextureArrayPS.glsl
diff --git a/media/materials/programs/GLSL150/Example_TextureArrayVS.glsl b/media/materials/programs/GLSL150/Example_TextureArrayVS.glsl
diff --git a/media/materials/programs/GLSL150/GlassFP.glsl b/media/materials/programs/GLSL150/GlassFP.glsl
diff --git a/media/materials/programs/GLSL150/GrassAmbientFp.glsl b/media/materials/programs/GLSL150/GrassAmbientFp.glsl
diff --git a/media/materials/programs/GLSL150/GrassAmbientVp.glsl b/media/materials/programs/GLSL150/GrassAmbientVp.glsl
diff --git a/media/materials/programs/GLSL150/GrassCasterFp.glsl b/media/materials/programs/GLSL150/GrassCasterFp.glsl
diff --git a/media/materials/programs/GLSL150/GrassCasterVp.glsl b/media/materials/programs/GLSL150/GrassCasterVp.glsl
diff --git a/media/materials/programs/GLSL150/GrassFp.glsl b/media/materials/programs/GLSL150/GrassFp.glsl
diff --git a/media/materials/programs/GLSL150/GrassReceiverFp.glsl b/media/materials/programs/GLSL150/GrassReceiverFp.glsl
diff --git a/media/materials/programs/GLSL150/GrassReceiverVp.glsl b/media/materials/programs/GLSL150/GrassReceiverVp.glsl
diff --git a/media/materials/programs/GLSL150/GrassTexVp.glsl b/media/materials/programs/GLSL150/GrassTexVp.glsl
diff --git a/media/materials/programs/GLSL150/GrassVp.glsl b/media/materials/programs/GLSL150/GrassVp.glsl
diff --git a/media/materials/programs/GLSL150/GrayScale.glsl b/media/materials/programs/GLSL150/GrayScale.glsl
diff --git a/media/materials/programs/GLSL150/HWBasicInstancing.vert b/media/materials/programs/GLSL150/HWBasicInstancing.vert
diff --git a/media/materials/programs/GLSL150/HW_VTFInstancing.vert b/media/materials/programs/GLSL150/HW_VTFInstancing.vert
diff --git a/media/materials/programs/GLSL150/HalftoneFP.glsl b/media/materials/programs/GLSL150/HalftoneFP.glsl
diff --git a/media/materials/programs/GLSL150/HardwareMorphAnimationVp.glsl b/media/materials/programs/GLSL150/HardwareMorphAnimationVp.glsl
diff --git a/media/materials/programs/GLSL150/HardwareMorphAnimationWithNormalsVp.glsl b/media/materials/programs/GLSL150/HardwareMorphAnimationWithNormalsVp.glsl
diff --git a/media/materials/programs/GLSL150/HardwarePoseAnimationVp.glsl b/media/materials/programs/GLSL150/HardwarePoseAnimationVp.glsl
diff --git a/media/materials/programs/GLSL150/HardwarePoseAnimationWithNormalsVp.glsl b/media/materials/programs/GLSL150/HardwarePoseAnimationWithNormalsVp.glsl
diff --git a/media/materials/programs/GLSL150/HeatBlurFp.glsl b/media/materials/programs/GLSL150/HeatBlurFp.glsl
diff --git a/media/materials/programs/GLSL150/HeatBlurVp.glsl b/media/materials/programs/GLSL150/HeatBlurVp.glsl
diff --git a/media/materials/programs/GLSL150/HeatCasterFp.glsl b/media/materials/programs/GLSL150/HeatCasterFp.glsl
diff --git a/media/materials/programs/GLSL150/HeatCasterVp.glsl b/media/materials/programs/GLSL150/HeatCasterVp.glsl
diff --git a/media/materials/programs/GLSL150/Instancing.frag b/media/materials/programs/GLSL150/Instancing.frag
diff --git a/media/materials/programs/GLSL150/InstancingMisc.vert b/media/materials/programs/GLSL150/InstancingMisc.vert
diff --git a/media/materials/programs/GLSL150/InvertFP.glsl b/media/materials/programs/GLSL150/InvertFP.glsl
diff --git a/media/materials/programs/GLSL150/LaplaceFP.glsl b/media/materials/programs/GLSL150/LaplaceFP.glsl
diff --git a/media/materials/programs/GLSL150/LightToHeatFp.glsl b/media/materials/programs/GLSL150/LightToHeatFp.glsl
diff --git a/media/materials/programs/GLSL150/LightToHeatVp.glsl b/media/materials/programs/GLSL150/LightToHeatVp.glsl
diff --git a/media/materials/programs/GLSL150/MetaballFP.glsl b/media/materials/programs/GLSL150/MetaballFP.glsl
diff --git a/media/materials/programs/GLSL150/NightVisionFP.glsl b/media/materials/programs/GLSL150/NightVisionFP.glsl
diff --git a/media/materials/programs/GLSL150/Ocean2GLSL.frag b/media/materials/programs/GLSL150/Ocean2GLSL.frag
diff --git a/media/materials/programs/GLSL150/Ocean2GLSL.vert b/media/materials/programs/GLSL150/Ocean2GLSL.vert
diff --git a/media/materials/programs/GLSL150/OffsetMappingFp.glsl b/media/materials/programs/GLSL150/OffsetMappingFp.glsl
diff --git a/media/materials/programs/GLSL150/OffsetMappingShadowsFp.glsl b/media/materials/programs/GLSL150/OffsetMappingShadowsFp.glsl
diff --git a/media/materials/programs/GLSL150/OffsetMappingShadowsVp.glsl b/media/materials/programs/GLSL150/OffsetMappingShadowsVp.glsl
diff --git a/media/materials/programs/GLSL150/OffsetMappingVp.glsl b/media/materials/programs/GLSL150/OffsetMappingVp.glsl
diff --git a/media/materials/programs/GLSL150/OffsetMapping_specular.glsl b/media/materials/programs/GLSL150/OffsetMapping_specular.glsl
diff --git a/media/materials/programs/GLSL150/OldMovieFP.glsl b/media/materials/programs/GLSL150/OldMovieFP.glsl
diff --git a/media/materials/programs/GLSL150/OldTV.glsl b/media/materials/programs/GLSL150/OldTV.glsl
diff --git a/media/materials/programs/GLSL150/ParticleGS_DisplayGS.glsl b/media/materials/programs/GLSL150/ParticleGS_DisplayGS.glsl
diff --git a/media/materials/programs/GLSL150/ParticleGS_DisplayPS.glsl b/media/materials/programs/GLSL150/ParticleGS_DisplayPS.glsl
diff --git a/media/materials/programs/GLSL150/ParticleGS_DisplayVS.glsl b/media/materials/programs/GLSL150/ParticleGS_DisplayVS.glsl
diff --git a/media/materials/programs/GLSL150/ParticleGS_GenerateGS.glsl b/media/materials/programs/GLSL150/ParticleGS_GenerateGS.glsl
diff --git a/media/materials/programs/GLSL150/ParticleGS_GenerateVS.glsl b/media/materials/programs/GLSL150/ParticleGS_GenerateVS.glsl
diff --git a/media/materials/programs/GLSL150/PassthroughFP.glsl b/media/materials/programs/GLSL150/PassthroughFP.glsl
diff --git a/media/materials/programs/GLSL150/PassthroughVP.glsl b/media/materials/programs/GLSL150/PassthroughVP.glsl
diff --git a/media/materials/programs/GLSL150/PosterizeFP.glsl b/media/materials/programs/GLSL150/PosterizeFP.glsl
diff --git a/media/materials/programs/GLSL150/Radial_Blur_FP.glsl b/media/materials/programs/GLSL150/Radial_Blur_FP.glsl
diff --git a/media/materials/programs/GLSL150/SampleFieldVS.glsl b/media/materials/programs/GLSL150/SampleFieldVS.glsl
diff --git a/media/materials/programs/GLSL150/ShaderInstancing.vert b/media/materials/programs/GLSL150/ShaderInstancing.vert
diff --git a/media/materials/programs/GLSL150/SharpenEdgesFP.glsl b/media/materials/programs/GLSL150/SharpenEdgesFP.glsl
diff --git a/media/materials/programs/GLSL150/ShowNormals.glsl b/media/materials/programs/GLSL150/ShowNormals.glsl
diff --git a/media/materials/programs/GLSL150/ShowTangents.glsl b/media/materials/programs/GLSL150/ShowTangents.glsl
diff --git a/media/materials/programs/GLSL150/ShowUV.glsl b/media/materials/programs/GLSL150/ShowUV.glsl
diff --git a/media/materials/programs/GLSL150/ShowUVdir3D.glsl b/media/materials/programs/GLSL150/ShowUVdir3D.glsl
diff --git a/media/materials/programs/GLSL150/StdQuad_Tex2_vp.glsl b/media/materials/programs/GLSL150/StdQuad_Tex2_vp.glsl
diff --git a/media/materials/programs/GLSL150/StdQuad_Tex2a_vp.glsl b/media/materials/programs/GLSL150/StdQuad_Tex2a_vp.glsl
diff --git a/media/materials/programs/GLSL150/StdQuad_Tex3_vp.glsl b/media/materials/programs/GLSL150/StdQuad_Tex3_vp.glsl
diff --git a/media/materials/programs/GLSL150/StdQuad_Tex4_vp.glsl b/media/materials/programs/GLSL150/StdQuad_Tex4_vp.glsl
diff --git a/media/materials/programs/GLSL150/StdQuad_vp.glsl b/media/materials/programs/GLSL150/StdQuad_vp.glsl
diff --git a/media/materials/programs/GLSL150/SwizzleGP.glsl b/media/materials/programs/GLSL150/SwizzleGP.glsl
diff --git a/media/materials/programs/GLSL150/TessellateTetrahedraGS.glsl b/media/materials/programs/GLSL150/TessellateTetrahedraGS.glsl
diff --git a/media/materials/programs/GLSL150/TilingFP.glsl b/media/materials/programs/GLSL150/TilingFP.glsl
diff --git a/media/materials/programs/GLSL150/VTFInstancing.vert b/media/materials/programs/GLSL150/VTFInstancing.vert
diff --git a/media/materials/programs/GLSL150/crowdVp.glsl b/media/materials/programs/GLSL150/crowdVp.glsl
diff --git a/media/materials/programs/GLSL150/hdr_bloom.glsl b/media/materials/programs/GLSL150/hdr_bloom.glsl
diff --git a/media/materials/programs/GLSL150/hdr_downscale2x2luminence.glsl b/media/materials/programs/GLSL150/hdr_downscale2x2luminence.glsl
diff --git a/media/materials/programs/GLSL150/hdr_downscale3x3.glsl b/media/materials/programs/GLSL150/hdr_downscale3x3.glsl
diff --git a/media/materials/programs/GLSL150/hdr_downscale3x3brightpass.glsl b/media/materials/programs/GLSL150/hdr_downscale3x3brightpass.glsl
diff --git a/media/materials/programs/GLSL150/hdr_finalToneMapping.glsl b/media/materials/programs/GLSL150/hdr_finalToneMapping.glsl
diff --git a/media/materials/programs/GLSL150/hdr_tonemap_util.glsl b/media/materials/programs/GLSL150/hdr_tonemap_util.glsl
diff --git a/media/materials/programs/GLSL150/instancingVp.glsl b/media/materials/programs/GLSL150/instancingVp.glsl
diff --git a/media/materials/programs/GLSL150/mrttestfp_quad.glsl b/media/materials/programs/GLSL150/mrttestfp_quad.glsl
diff --git a/media/materials/programs/GLSL150/mrttestfp_scene.glsl b/media/materials/programs/GLSL150/mrttestfp_scene.glsl
diff --git a/media/materials/programs/GLSL150/oceanGLSL.frag b/media/materials/programs/GLSL150/oceanGLSL.frag
diff --git a/media/materials/programs/GLSL150/oceanGLSL.vert b/media/materials/programs/GLSL150/oceanGLSL.vert
diff --git a/media/materials/programs/GLSL150/pssmCasterFp.glsl b/media/materials/programs/GLSL150/pssmCasterFp.glsl
diff --git a/media/materials/programs/GLSL150/pssmCasterVp.glsl b/media/materials/programs/GLSL150/pssmCasterVp.glsl
diff --git a/media/materials/programs/GLSL150/pssmReceiverFp.glsl b/media/materials/programs/GLSL150/pssmReceiverFp.glsl
diff --git a/media/materials/programs/GLSL150/pssmReceiverVp.glsl b/media/materials/programs/GLSL150/pssmReceiverVp.glsl
diff --git a/media/materials/programs/GLSL150/shadows.glsl b/media/materials/programs/GLSL150/shadows.glsl
diff --git a/media/materials/programs/GLSL150/skinningTwoWeightsShadowCasterVp.glsl b/media/materials/programs/GLSL150/skinningTwoWeightsShadowCasterVp.glsl
diff --git a/media/materials/programs/GLSL150/skinningTwoWeightsVp.glsl b/media/materials/programs/GLSL150/skinningTwoWeightsVp.glsl
diff --git a/media/materials/programs/skinningTwoWeightsVp.glsl b/media/materials/programs/skinningTwoWeightsVp.glsl
diff --git a/media/materials/scripts/QBuild.material b/media/materials/scripts/QBuild.material
diff --git a/media/materials/textures/grass_1024.jpg b/media/materials/textures/grass_1024.jpg
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -69,27 +69,120 @@ MaterialHighlighter.h
 
 ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/OgreXML")
 
+
 #file(GLOB UI_FILES ./ui_files/*.ui)
 # if we don't include this CMake will not include ui headers properly:
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${BUILD_INCLUDE_DIR} ${BUILD_UIH_DIR})
 
+
 ##############################################################
 #  Processing ogre-procedural
 ##############################################################
-#ADD_SUBDIRECTORY(ogre-procedural)
-#include_directories("${OgreProcedural_SOURCE_DIR}/library/include" "${OgreProcedural_BINARY_DIR}/include")
+set(OgreProcedural_CONFIG_FREETYPE "PROCEDURAL_NO_FREETYPE")
+set(OGRE_PROCEDURAL_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ogre-procedural/library/")
+set(OgreProcedural_TEMPLATES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ogre-procedural/CMake/Templates")
+include_directories(${OGRE_PROCEDURAL_LIB_DIR}include)
+
+configure_file(${OgreProcedural_TEMPLATES_DIR}/ProceduralPlatform.h.in ${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralPlatform.h)
+
+set(SRC_FILES
+${SRC_FILES}
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralBoxGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralCapsuleGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralConeGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralCylinderGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralIcoSphereGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralPlaneGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralRoundedBoxGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralSphereGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTorusGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTorusKnotGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTubeGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralUtils.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralShape.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralShapeGenerators.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralPath.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralPathGenerators.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTrack.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralExtruder.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralLathe.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTriangulator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralPrecompiledHeaders.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralMultiShape.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralMultiShapeGenerators.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralGeometryHelpers.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralBoolean.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralSpringGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralSVG.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralDebugRendering.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTextureGenerator.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTextureModifiers.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralNoise.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralMeshModifiers.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTextureBuffer.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralTriangleBuffer.cpp
+${OGRE_PROCEDURAL_LIB_DIR}src/ProceduralPrismGenerator.cpp
+)
+
+set(HEADER_FILES
+${HEADER_FILES}
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralPlatform.h
+${OGRE_PROCEDURAL_LIB_DIR}include/Procedural.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralMeshGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralBoxGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralCapsuleGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralConeGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralCylinderGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralIcoSphereGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralPlaneGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralSphereGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralRoundedBoxGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTorusGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTorusKnotGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTubeGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralUtils.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralExtruder.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralLathe.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralShape.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralShapeGenerators.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralShapeGeneratorsBase.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralPath.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralPathGenerators.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralPathGeneratorsBase.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTrack.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralSplines.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTriangulator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTriangleBuffer.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralStableHeaders.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralMultiShape.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralMultiShapeGenerators.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralGeometryHelpers.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralBoolean.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralSpringGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralSVG.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralDebugRendering.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTextureGenerator.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTextureModifiers.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralNoise.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralMeshModifiers.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralTextureBuffer.h
+${OGRE_PROCEDURAL_LIB_DIR}include/ProceduralPrismGenerator.h
+)
+
 
 ##############################################################
 # Determine Ogre version for creating the symlinks in linux
 ##############################################################
 IF(UNIX OR APPLE)
-  file(READ ${OGRE_INCLUDE_DIR}OgreBuildSettings.h OGRE_TEMP_VERSION_CONTENT)
+  file(READ ${OGRE_INCLUDE_DIR}/OgreBuildSettings.h OGRE_TEMP_VERSION_CONTENT)
   get_preprocessor_entry(OGRE_TEMP_VERSION_CONTENT OGRE_VERSION_MAJOR OGRE_VERSION_MAJOR)
   get_preprocessor_entry(OGRE_TEMP_VERSION_CONTENT OGRE_VERSION_MINOR OGRE_VERSION_MINOR)
   get_preprocessor_entry(OGRE_TEMP_VERSION_CONTENT OGRE_VERSION_PATCH OGRE_VERSION_PATCH)
   get_preprocessor_entry(OGRE_TEMP_VERSION_CONTENT OGRE_VERSION_NAME OGRE_VERSION_NAME)
   set(OGRE_VERSION "${OGRE_VERSION_MAJOR}.${OGRE_VERSION_MINOR}.${OGRE_VERSION_PATCH}")
+  pkg_message(OGRE "Found Ogre3D ${OGRE_VERSION_NAME} (${OGRE_VERSION})")
 ENDIF()
+
 ##############################################################
 #  Adding Resources
 ##############################################################
@@ -132,7 +225,6 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
 ${OGRE_Codec_Assimp_LIBRARY_REL} #TODO: find a better way to link ogreassimp
 ${ASSIMP_LIBRARY_REL}
 ${OGRE_LIBRARIES}
-${OgreProcedural_LIBRARY}
 Qt::Gui
 Qt::Core
 Qt::Widgets
@@ -147,73 +239,73 @@ ui
 ##############################################################
 #  Install libraries
 ##############################################################
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    IF(OGRE_Plugin_CgProgramManager_INCLUDE_DIR)
+        SET(OGRELIBLIST cg
+            Plugin_CgProgramManager_d
+        )
+    ENDIF()
+    SET(OGRELIBLIST ${OGRELIBLIST}
+        OgreMain_d
+        Codec_Assimp_d
+        Codec_STBI_d
+        RenderSystem_GL_d
+        Plugin_OctreeSceneManager_d
+        Plugin_BSPSceneManager_d
+        Plugin_ParticleFX_d
+        Plugin_PCZSceneManager_d
+        Plugin_OctreeZone_d
+        OgrePaging_d
+        OgreProperty_d
+        OgreTerrain_d
+        OgreRTShaderSystem_d
+        OgreVolume_d
+        OgreOverlay_d)
 
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        IF(OGRE_Plugin_CgProgramManager_INCLUDE_DIR)
-            SET(OGRELIBLIST cg
-                Plugin_CgProgramManager_d
-            )
+    FOREACH(ogrelib ${OGRELIBLIST})
+        IF(WIN32)
+            INSTALL(FILES ${OGRE_PLUGIN_DIR_DBG}/${ogrelib}.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
         ENDIF()
-        SET(OGRELIBLIST ${OGRELIBLIST}
-            OgreMain_d
-            Codec_Assimp_d
-            Codec_STBI_d
-            RenderSystem_GL_d
-            Plugin_OctreeSceneManager_d
-            Plugin_BSPSceneManager_d
-            Plugin_ParticleFX_d
-            Plugin_PCZSceneManager_d
-            Plugin_OctreeZone_d
-            OgrePaging_d
-            OgreProperty_d
-            OgreTerrain_d
-            OgreRTShaderSystem_d
-            OgreVolume_d
-            OgreOverlay_d)
-
-        FOREACH(ogrelib ${OGRELIBLIST})
-            IF(WIN32)
-                INSTALL(FILES ${OGRE_PLUGIN_DIR_DBG}/${ogrelib}.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+    ENDFOREACH(ogrelib)
+else()
+    IF(OGRE_Plugin_CgProgramManager_INCLUDE_DIR)
+        SET(OGRELIBLIST cg
+            Plugin_CgProgramManager
+        )
+    ENDIF()
+    SET(OGRELIBLIST ${OGRELIBLIST}
+        OgreMain
+        Codec_Assimp
+        Codec_STBI
+        RenderSystem_GL
+        Plugin_OctreeSceneManager
+        Plugin_BSPSceneManager
+        Plugin_ParticleFX
+        Plugin_PCZSceneManager
+        Plugin_OctreeZone
+        OgrePaging
+        OgreProperty
+        OgreTerrain
+        OgreRTShaderSystem
+        OgreVolume
+        OgreOverlay)
+
+    FOREACH(ogrelib ${OGRELIBLIST})
+        IF(WIN32)
+            INSTALL(FILES $ENV{OGRE_HOME}/bin/${ogrelib}.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+        ELSEIF(APPLE)
+            INSTALL(FILES $ENV{OGRE_HOME}/lib/macosx/${${ogrelib}.framework}/Version/13.5/${ogrelib} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+        ELSEIF(UNIX)
+            IF(EXISTS ${OGRE_${ogrelib}_LIBRARY_REL})
+                INSTALL(FILES ${OGRE_${ogrelib}_LIBRARY_REL}.${OGRE_VERSION_MAJOR}.${OGRE_VERSION_MINOR} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
             ENDIF()
-        ENDFOREACH(ogrelib)
-    else()
-        IF(OGRE_Plugin_CgProgramManager_INCLUDE_DIR)
-            SET(OGRELIBLIST cg
-                Plugin_CgProgramManager
-            )
-        ENDIF()
-        SET(OGRELIBLIST ${OGRELIBLIST}
-            OgreMain
-            Codec_Assimp
-            Codec_STBI
-            RenderSystem_GL
-            Plugin_OctreeSceneManager
-            Plugin_BSPSceneManager
-            Plugin_ParticleFX
-            Plugin_PCZSceneManager
-            Plugin_OctreeZone
-            OgrePaging
-            OgreProperty
-            OgreTerrain
-            OgreRTShaderSystem
-            OgreVolume
-            OgreOverlay)
-
-        FOREACH(ogrelib ${OGRELIBLIST})
-            IF(WIN32)
-                INSTALL(FILES $ENV{OGRE_HOME}/bin/${ogrelib}.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-            ELSEIF(APPLE)
-                INSTALL(FILES $ENV{OGRE_HOME}/lib/macosx/${${ogrelib}.framework}/Version/13.5/${ogrelib} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-            ELSEIF(UNIX)
-                IF(EXISTS ${OGRE_${ogrelib}_LIBRARY_REL})
-                    INSTALL(FILES ${OGRE_${ogrelib}_LIBRARY_REL}.${OGRE_VERSION_MAJOR}.${OGRE_VERSION_MINOR} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-                ENDIF()
-                IF(EXISTS ${OGRE_PLUGIN_DIR_REL}/${ogrelib}.so)
-                    INSTALL(FILES ${OGRE_PLUGIN_DIR_REL}/${ogrelib}.so.${OGRE_VERSION_MAJOR}.${OGRE_VERSION_MINOR} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-                ENDIF()
+            IF(EXISTS ${OGRE_PLUGIN_DIR_REL}/${ogrelib}.so)
+                INSTALL(FILES ${OGRE_PLUGIN_DIR_REL}/${ogrelib}.so.${OGRE_VERSION_MAJOR}.${OGRE_VERSION_MINOR} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
             ENDIF()
-        ENDFOREACH(ogrelib)
-    endif()
+        ENDIF()
+    ENDFOREACH(ogrelib)
+endif()
+
 IF(WIN32)
     GET_FILENAME_COMPONENT(ASSIMP_DLL_DIR ${ASSIMP_INCLUDE_DIR} PATH)
     find_file(ASSIMP_DLL_FILE NAMES libassim.dll assimp.dll Assimp32.dll PATHS "${ASSIMP_DLL_DIR}/../bin" "${ASSIMP_DLL_DIR}/../bin/x86")

diff --git a/src/dependencies/ogre-procedural b/src/dependencies/ogre-procedural