diff --git a/3rdpty/MathGeoLib b/3rdpty/MathGeoLib index 35058b7f..85ffab5f 160000 --- a/3rdpty/MathGeoLib +++ b/3rdpty/MathGeoLib @@ -1 +1 @@ -Subproject commit 35058b7f881c2a2ad00bf21c083aa88a70277864 +Subproject commit 85ffab5f6a19bfff3fc3588d4f1656b2664ca19a diff --git a/CMAssetsManage b/CMAssetsManage index 74e1d564..a100a10d 160000 --- a/CMAssetsManage +++ b/CMAssetsManage @@ -1 +1 @@ -Subproject commit 74e1d564be1a9c2af21b3fc2e4ca319e23b6616a +Subproject commit a100a10dc8750903e5bf3779c1f337f5a940910e diff --git a/CMCMakeModule b/CMCMakeModule index 4ac904d8..d4087fe9 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit 4ac904d834b45e6cb3edc1767726850615ca89ee +Subproject commit d4087fe96c0acd43d376ec660bd5f1f351755448 diff --git a/CMCore b/CMCore index 6107f34e..25748fde 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 6107f34e21e5f104091d28b3db17e6cbeb7dc967 +Subproject commit 25748fde9bdb02d8d1f857838d9e7111db4103a4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 300020b7..23806317 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,20 +21,22 @@ use_cm_module(AssetsManage) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") include_directories(${ULRE_3RDPTY_ROOT_PATH}/jsoncpp/include) add_subdirectory(3rdpty/jsoncpp) + SET(JSONCPP_LIBRARY jsoncpp_lib) +ELSE() + SET(JSONCPP_LIBRARY jsoncpp) ENDIF() SET(ULRE CMCore CMPlatform CMAssetsManage ULRE.Util - ULRE.Shader ULRE.RenderDevice.Vulkan ULRE.SceneGraph MathGeoLib spirv-cross-core SPIRV glslang - jsoncpp_lib + ${JSONCPP_LIBRARY} ${RENDER_LIBRARY} ${Vulkan_LIBRARIES}) @@ -58,9 +60,7 @@ add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/glslang) include_directories(${SPIRV_CROSS_PATH}/external/glslang) add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/SPIRV) -if(WIN32) add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/OGLCompilersDLL) -endif() SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index 7b1ea73c..26fd8397 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -76,15 +76,15 @@ private: ubo_mvp=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); if(!ubo_mvp) - return(nullptr); - + return(false); + material_instance->BindUBO("world",ubo_mvp); material_instance->BindUBO("fragment_world",ubo_mvp); material_instance->Update(); return(true); } - + void InitVBO() { vertex_buffer =device->CreateVBO(FMT_RG32F, VERTEX_COUNT,vertex_data); @@ -94,7 +94,7 @@ private: bool InitPipeline() { - AutoDelete + AutoDelete pipeline_creater=new vulkan::PipelineCreater(device,material,sc_render_target); pipeline_creater->CloseCullFace(); pipeline_creater->Set(PRIM_TRIANGLE_STRIP); diff --git a/example/Vulkan/VulkanAppFramework.h b/example/Vulkan/VulkanAppFramework.h index feeb2d87..486fb987 100644 --- a/example/Vulkan/VulkanAppFramework.h +++ b/example/Vulkan/VulkanAppFramework.h @@ -50,7 +50,7 @@ protected: vulkan::Device * device =nullptr; vulkan::SwapchainRenderTarget * sc_render_target =nullptr; - + vulkan::Semaphore * present_complete_semaphore =nullptr, * render_complete_semaphore =nullptr; @@ -80,7 +80,7 @@ public: SAFE_CLEAR(shader_manage); SAFE_CLEAR(device); - SAFE_CLEAR(win); + SAFE_CLEAR(win); SAFE_CLEAR(inst); } @@ -93,8 +93,6 @@ public: return(false); #endif// - InitDefaultShaderBuildResource(); - InitNativeWindowSystem(); VK_NAMESPACE::InitVulkanProperties(); @@ -153,7 +151,7 @@ public: virtual void MouseUp(uint){} virtual void MouseMove(){} virtual void MouseWheel(int,int,uint){} - + void OnResize(int w,int h) { if(w>0&&h>0) @@ -167,7 +165,7 @@ public: { if(cmd_buf) SAFE_CLEAR_OBJECT_ARRAY(cmd_buf,swap_chain_count); - + sc_render_target=device->GetSwapchainRT(); swap_chain_count=sc_render_target->GetImageCount(); @@ -189,7 +187,7 @@ public: const vulkan::IndexBuffer *ib=r->GetIndexBuffer(); vulkan::CommandBuffer *cb=cmd_buf[index]; - + cb->Begin(); cb->BeginRenderPass(sc_render_target->GetRenderPass(),sc_render_target->GetFramebuffer(index)); cb->Bind(p); @@ -204,7 +202,7 @@ public: cb->EndRenderPass(); cb->End(); } - + void BuildCommandBuffer(vulkan::Pipeline *p,vulkan::MaterialInstance *mi,vulkan::Renderable *r) { for(uint32_t i=0;iGetCurrentFrameIndices(),rl); } @@ -250,7 +248,7 @@ public: virtual void SubmitDraw(int index) { VkCommandBuffer cb=*cmd_buf[index]; - + sc_render_target->Submit(cb,present_complete_semaphore,render_complete_semaphore); sc_render_target->PresentBackbuffer(render_complete_semaphore); sc_render_target->Wait(); @@ -297,7 +295,7 @@ public: { if(!VulkanApplicationFramework::Init(w,h)) return(false); - + InitCamera(w,h); return(true); } @@ -314,7 +312,7 @@ public: camera.Refresh(); //更新矩阵计算 } - + void Resize(int w,int h)override { camera.width=w; diff --git a/inc/hgl/graph/material/Component.h b/inc/hgl/graph/material/Component.h index a69944e4..e88f3961 100644 --- a/inc/hgl/graph/material/Component.h +++ b/inc/hgl/graph/material/Component.h @@ -91,8 +91,8 @@ MATERIAL_NAMESPACE_BEGIN #undef MATERIAL_DATA_FORMAT_DEFINE };//enum class DataFormat - inline const ComponentDataType GetFormatBaseType (const enum class DataFormat &df){return ComponentDataType(uint(df)>>4);} - inline const uint GetFormatChannels (const enum class DataFormat &df){return uint(df)&7;} + inline const ComponentDataType GetFormatBaseType (const DataFormat &df){return ComponentDataType(uint(df)>>4);} + inline const uint GetFormatChannels (const DataFormat &df){return uint(df)&7;} using ComponentBitsConfig=uint32; @@ -110,6 +110,6 @@ MATERIAL_NAMESPACE_BEGIN bool LinearColorspace; ///<是要求线性颜色空间 };//struct ComponentConfig - const ComponentConfig *GetConfig(const enum class Component c); + const ComponentConfig *GetConfig(const Component c); MATERIAL_NAMESPACE_END #endif//HGL_GRAPH_MATERIAL_COMPONENT_INCLUDE diff --git a/inc/hgl/graph/shader/ShaderMaker.h b/inc/hgl/graph/shader/ShaderMaker.h index 9cede1d3..419e8e74 100644 --- a/inc/hgl/graph/shader/ShaderMaker.h +++ b/inc/hgl/graph/shader/ShaderMaker.h @@ -41,7 +41,7 @@ protected: protected: - NodeList node_list[node::NodeType::NODE_TYPE_RANGE_SIZE]; + NodeList node_list[(size_t)node::NodeType::NODE_TYPE_RANGE_SIZE]; uint in_location=0; uint out_location=0; diff --git a/inc/hgl/graph/shader/param/in.h b/inc/hgl/graph/shader/param/in.h index c318addb..8e0e0014 100644 --- a/inc/hgl/graph/shader/param/in.h +++ b/inc/hgl/graph/shader/param/in.h @@ -49,7 +49,11 @@ public: virtual bool Join(node::Node *,param::OutputParam *); ///<增加一个关联节点 virtual void Break(){join_node=nullptr;join_param=nullptr;} ///<断开一个关联节点 - virtual bool Check(){return(must_join?join_param:true);} ///<检测当前节点是否可用 + virtual bool Check() ///<检测当前节点是否可用 + { + if(must_join&&!join_param)return(false); + return true; + } };//class InputParam:public Param SHADER_PARAM_NAMESPACE_END #endif//#ifndef HGL_GRAPH_SHADER_PARAM_INPUT_INCLUDE diff --git a/inc/hgl/graph/vulkan/VKFormat.h b/inc/hgl/graph/vulkan/VKFormat.h index cb901ae6..7be720f1 100644 --- a/inc/hgl/graph/vulkan/VKFormat.h +++ b/inc/hgl/graph/vulkan/VKFormat.h @@ -163,18 +163,18 @@ VK_NAMESPACE_BEGIN #define FMT_D32F_S8U VK_FORMAT_D32_SFLOAT_S8_UINT /** - * Type of data bytes/pixel Palette size Line Segments User For Compressed components/Description - * ----------------+----------------+--------------+-----------------+--------------------+----------------------------------------------------+-------------------------------------- - * BC1(S3TC1) RGB5/RGB5A1 0.5 4 1 Color maps,Normal maps - * BC2(S3TC3) RGBA4 1 4 1 BC1+uncompress 4-bit alpha - * BC3(S3TC5) RGBA4 1 4 1Color+1Alpha Color maps BC1+BC4 compress alpha - * BC4(ATI1/3Dc+) Grayscale 0.5 8 1 - * BC5(ATI2/3Dc) 2xGrayscale 1 8 per channel 1 per channel Tangent-space normal maps - * BC6H FloatRGB 1 8-16 1-2 HDR images - * BC7 RGB/RGBA 1 4-16 1-3 High-quality color maps + * Type of data bytes/pixel Palette size Line Segments User For Compressed components/Description + * ---------------+----------------+---------------+-----------------+-------------------+-----------------------------+-------------------------------------- + * BC1(S3TC1) RGB5/RGB5A1 0.5 4 1 Color maps,Normal maps + * BC2(S3TC3) RGBA4 1 4 1 BC1+uncompress 4-bit alpha + * BC3(S3TC5) RGBA4 1 4 1 Color+1Alpha Color maps BC1+BC4 compress alpha + * BC4(ATI1/3Dc+) Grayscale 0.5 8 1 + * BC5(ATI2/3Dc) 2xGrayscale 1 8 per channel 1 per channel Tangent-space normal maps + * BC6H FloatRGB 1 8-16 1-2 HDR images + * BC7 RGB/RGBA 1 4-16 1-3 High-quality color maps * * ETC RGB - * ETC2 RGB/RGBA1 Color maps,Normals + * ETC2 RGB/RGBA1 Color maps,Normals * EAC Grayscale * 2xEAC RG * ETC2+EAC RGBA @@ -183,7 +183,7 @@ VK_NAMESPACE_BEGIN * PVRTC2 RGB/RGBA1/RGBA * * ASTC R/RG/RGB/RGBA - * ----------------+----------------+--------------+-----------------+--------------------+----------------------------------------------------+ + * ---------------+----------------+---------------+-----------------+-------------------+-----------------------------+-------------------------------------- */ #define FMT_BC1_RGBUN VK_FORMAT_BC1_RGB_UNORM_BLOCK diff --git a/inc/hgl/graph/vulkan/VKRenderPass.h b/inc/hgl/graph/vulkan/VKRenderPass.h index e18646ba..acc123cd 100644 --- a/inc/hgl/graph/vulkan/VKRenderPass.h +++ b/inc/hgl/graph/vulkan/VKRenderPass.h @@ -62,21 +62,7 @@ public: ~RenderpassCreater()=default; - int AddSwapchainImage() - { - VkAttachmentDescription desc; - - desc.format = device->GetSurfaceFormat(); - desc.samples = VK_SAMPLE_COUNT_1_BIT; - desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; - desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; - desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - desc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - desc.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; - desc.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; - - return atta_desc_list.Add(desc); - } + int AddSwapchainImage(); };//class RenderpassCreater VK_NAMESPACE_END #endif//HGL_GRAPH_VULKAN_RENDER_PASS_INCLUDE diff --git a/inc/hgl/graph/vulkan/VKRenderTarget.h b/inc/hgl/graph/vulkan/VKRenderTarget.h index e663e1dc..a6450fe2 100644 --- a/inc/hgl/graph/vulkan/VKRenderTarget.h +++ b/inc/hgl/graph/vulkan/VKRenderTarget.h @@ -24,7 +24,7 @@ public: SubmitQueue(Device *dev,VkQueue q,const uint32_t fence_count=1); virtual ~SubmitQueue(); - bool Wait(const bool wait_wall=true,const uint64 time_out=HGL_NANO_SEC_PER_SEC); + bool Wait(const bool wait_wall=true,const uint64_t time_out=HGL_NANO_SEC_PER_SEC); bool Submit(const VkCommandBuffer &cmd_buf,vulkan::Semaphore *wait_sem,vulkan::Semaphore *complete_sem); bool Submit(const VkCommandBuffer *cmd_buf,const uint32_t count,vulkan::Semaphore *wait_sem,vulkan::Semaphore *complete_sem); };//class SumbitQueue diff --git a/src/RenderDevice/CMakeLists.txt b/src/RenderDevice/CMakeLists.txt index f841aa43..96f5da34 100644 --- a/src/RenderDevice/CMakeLists.txt +++ b/src/RenderDevice/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(Vulkan) -add_subdirectory(Shader) diff --git a/src/RenderDevice/Shader/param/shader_param_type.cpp b/src/RenderDevice/Shader/param/shader_param_type.cpp index 0fea5d2c..a3790485 100644 --- a/src/RenderDevice/Shader/param/shader_param_type.cpp +++ b/src/RenderDevice/Shader/param/shader_param_type.cpp @@ -3,7 +3,7 @@ SHADER_PARAM_NAMESPACE_BEGIN const char *GetTypename(const ParamType pt) { - constexpr char *name[]= + const char *name[]= { "?boolean?", "?float?", @@ -83,4 +83,4 @@ const char *GetTypename(const ParamType pt) return name[size_t(pt)-size_t(ParamType::BEGIN_RANGE)]; } -SHADER_PARAM_NAMESPACE_END \ No newline at end of file +SHADER_PARAM_NAMESPACE_END diff --git a/src/RenderDevice/Vulkan/CMakeLists.txt b/src/RenderDevice/Vulkan/CMakeLists.txt index 6c3311ec..c59923e1 100644 --- a/src/RenderDevice/Vulkan/CMakeLists.txt +++ b/src/RenderDevice/Vulkan/CMakeLists.txt @@ -42,8 +42,8 @@ SET(RENDER_DEVICE_VULKAN_SOURCE VKFormat.cpp VKRenderable.cpp VKSampler.cpp) -SET(RENDER_DEVICE_VULKAN_POD_SOURCE pod/VKPipelineCreateInfo.POD.cpp - pod/VKTextureLoader.cpp) +SET(RENDER_DEVICE_VULKAN_POD_SOURCE POD/VKPipelineCreateInfo.POD.cpp + POD/VKTextureLoader.cpp) SOURCE_GROUP("Device" FILES ${VK_DEVICE_SOURCE}) SOURCE_GROUP("Descriptor Sets" FILES ${VK_DESCRIPTOR_SETS_SOURCE}) diff --git a/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp b/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp index 9b1f69de..c19d8907 100644 --- a/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp +++ b/src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp @@ -140,11 +140,11 @@ bool LoadFromFile(const OSString &filename,VK_NAMESPACE::PipelineCreater *pc) if(filename.IsEmpty()||!pc) return(false); - void *data; + char *data; uint size=filesystem::LoadFileToMemory(filename,(void **)&data); bool result=pc->LoadFromMemory((uchar *)data,size); delete[] data; return result; -} \ No newline at end of file +} diff --git a/src/RenderDevice/Vulkan/VKDeviceCreater.cpp b/src/RenderDevice/Vulkan/VKDeviceCreater.cpp index 0dd5d565..fb57c75c 100644 --- a/src/RenderDevice/Vulkan/VKDeviceCreater.cpp +++ b/src/RenderDevice/Vulkan/VKDeviceCreater.cpp @@ -7,10 +7,8 @@ #include #include -#ifdef _DEBUG #include #include -#endif//_DEBUG VK_NAMESPACE_BEGIN Swapchain *CreateSwapchain(const DeviceAttribute *attr,const VkExtent2D &acquire_extent); diff --git a/src/RenderDevice/Vulkan/VKDeviceRenderPass.cpp b/src/RenderDevice/Vulkan/VKDeviceRenderPass.cpp index c707ffb5..c5afa911 100644 --- a/src/RenderDevice/Vulkan/VKDeviceRenderPass.cpp +++ b/src/RenderDevice/Vulkan/VKDeviceRenderPass.cpp @@ -218,7 +218,7 @@ RenderPass *Device::CreateRenderPass( const List &des { if(!attr->physical_device->IsColorAttachmentOptimal(*cf) &&!attr->physical_device->IsColorAttachmentLinear(*cf)) - return(false); + return(nullptr); ++cf; } @@ -226,7 +226,7 @@ RenderPass *Device::CreateRenderPass( const List &des if(!attr->physical_device->IsDepthAttachmentOptimal(depth_format) &&!attr->physical_device->IsDepthAttachmentLinear(depth_format)) - return(false); + return(nullptr); VkRenderPassCreateInfo rp_info; rp_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; @@ -250,10 +250,10 @@ RenderPass *Device::CreateRenderPass( const List &des RenderPass *Device::CreateRenderPass(VkFormat color_format,VkFormat depth_format,VkImageLayout color_final_layout,VkImageLayout depth_final_layout) const { if(!attr->physical_device->IsColorAttachmentOptimal(color_format)) - return(false); + return(nullptr); if(!attr->physical_device->IsDepthAttachmentOptimal(depth_format)) - return(false); + return(nullptr); List color_ref; VkAttachmentReference depth_ref; diff --git a/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp b/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp index 14aad40f..587d4e59 100644 --- a/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp +++ b/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp @@ -76,10 +76,7 @@ bool Device::CreateSwapchainColorTexture() AutoDeleteArray sc_images=new VkImage[swapchain->swap_chain_count]; if(vkGetSwapchainImagesKHR(attr->device,swapchain->swap_chain,&(swapchain->swap_chain_count),sc_images)!=VK_SUCCESS) - { - delete sc_images; return(false); - } VkImage *ip=sc_images; Texture2D *tex; diff --git a/src/RenderDevice/Vulkan/VKMemory.cpp b/src/RenderDevice/Vulkan/VKMemory.cpp index bb554177..eca608ae 100644 --- a/src/RenderDevice/Vulkan/VKMemory.cpp +++ b/src/RenderDevice/Vulkan/VKMemory.cpp @@ -7,7 +7,7 @@ Memory *Device::CreateMemory(const VkMemoryRequirements &req,uint32_t properties uint32_t index; if(!attr->physical_device->CheckMemoryType(req.memoryTypeBits,properties,&index)) - return(false); + return(nullptr); VkMemoryAllocateInfo alloc_info; diff --git a/src/RenderDevice/Vulkan/VKRenderPass.cpp b/src/RenderDevice/Vulkan/VKRenderPass.cpp index f7616dbc..618bad21 100644 --- a/src/RenderDevice/Vulkan/VKRenderPass.cpp +++ b/src/RenderDevice/Vulkan/VKRenderPass.cpp @@ -1,7 +1,24 @@ #include +#include VK_NAMESPACE_BEGIN RenderPass::~RenderPass() { vkDestroyRenderPass(device,render_pass,nullptr); } + +int RenderpassCreater::AddSwapchainImage() +{ + VkAttachmentDescription desc; + + desc.format = device->GetSurfaceFormat(); + desc.samples = VK_SAMPLE_COUNT_1_BIT; + desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; + desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + desc.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + desc.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; + desc.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + + return atta_desc_list.Add(desc); +} VK_NAMESPACE_END diff --git a/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp b/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp index ee1ca8b9..901fc98b 100644 --- a/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp +++ b/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp @@ -66,8 +66,8 @@ const ShaderModule *ShaderModuleManage::CreateShader(const VkShaderStageFlagBits const ShaderModule *ShaderModuleManage::CreateShader(const VkShaderStageFlagBits shader_stage_bit,const OSString &filename) { - void *spv_data; - int64 spv_size=hgl::filesystem::LoadFileToMemory(filename,&spv_data); + char *spv_data; + int64 spv_size=hgl::filesystem::LoadFileToMemory(filename,(void **)&spv_data); if(spv_size<=0) return(nullptr); diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp index 2a918724..bf06c960 100644 --- a/src/SceneGraph/InlineGeometry.cpp +++ b/src/SceneGraph/InlineGeometry.cpp @@ -1194,7 +1194,7 @@ namespace hgl GeometryCreater3D gc(db,mtl); if(!gc.Init(6)) - return(false); + return(nullptr); VB3f *vertex=gc.GetVertex(); VB4f *color=gc.GetColor(); @@ -1239,7 +1239,7 @@ namespace hgl GeometryCreater3D gc(db,mtl); if(!gc.Init(8)) - return(false); + return(nullptr); VB3f *vertex=gc.GetVertex(); @@ -1268,4 +1268,4 @@ namespace hgl return gc.Finish(); } }//namespace graph -}//namespace hgl \ No newline at end of file +}//namespace hgl diff --git a/src/SceneGraph/Mesh.cpp b/src/SceneGraph/Mesh.cpp index adf6352e..c3eb4558 100644 --- a/src/SceneGraph/Mesh.cpp +++ b/src/SceneGraph/Mesh.cpp @@ -1,9 +1,9 @@ -#include +#include #include #include #include #include -#include +#include namespace hgl { diff --git a/src/SceneGraph/SceneFile.cpp b/src/SceneGraph/SceneFile.cpp index 722e26c6..70713d46 100644 --- a/src/SceneGraph/SceneFile.cpp +++ b/src/SceneGraph/SceneFile.cpp @@ -1,11 +1,11 @@ -#include +#include #include #include #include #include #include #include -#include +#include namespace hgl { diff --git a/src/SceneGraph/material/MaterialComponent.cpp b/src/SceneGraph/material/MaterialComponent.cpp index 96f20ce2..ae1d1721 100644 --- a/src/SceneGraph/material/MaterialComponent.cpp +++ b/src/SceneGraph/material/MaterialComponent.cpp @@ -32,7 +32,7 @@ MATERIAL_NAMESPACE_BEGIN }; };//namespace - const ComponentConfig *GetConfig(const enum class Component c) + const ComponentConfig *GetConfig(const Component c) { if(c<=Component::BEGIN_RANGE ||c>=Component::END_RANGE)return(nullptr);