hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated codes to support newly CM??? modules.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-02-19 19:28:47 +08:00
parent b8a83a25eb
commit 2fb443bcb4
19 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCMakeModule

@ -1 +1 @@
Subproject commit 9899bc1c07122a77b754345e8ce31fbcd8624772
Subproject commit ca9aece201dd581c0576fe5448162686081261ff

2
CMCore

@ -1 +1 @@
Subproject commit 68d0082e0e2dd2ec2d55fe0756aeb0bfb3c2be69
Subproject commit 47f40baaab2278752e86762d92c4738e1317a22c

2
CMPlatform

@ -1 +1 @@
Subproject commit c91c3780f42df182fdb752b8165ed41a03358949
Subproject commit ef90beb4501fe8712ab93e4c775612e172598fa3

2
CMSceneGraph

@ -1 +1 @@
Subproject commit c539ce808b9a8a3acf451c3e26d47881631be954
Subproject commit 441c61c5fdb0d625d84e664385a1226c28b48b36

2
CMUtil

@ -1 +1 @@
Subproject commit b0ca13cfb34175fd90c370ded64e8c0f3586b8ec
Subproject commit 9f94d5082bbbba65d55ae259deebbfc72b4a672a

4
example/Vulkan/first_triangle.cpp
View File

@ -56,8 +56,8 @@ private:
Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!primitive)return(false);
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false);
if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data )))return(false);
if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data )))return(false);
render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
return(render_obj);

2
example/common/VulkanAppFramework.h
View File

@ -20,7 +20,7 @@
#include<hgl/graph/VKRenderTarget.h>
#include<hgl/graph/VKRenderResource.h>
#include<hgl/graph/RenderList.h>
#include<hgl/type/Color.h>
#include<hgl/color/Color.h>
#include<hgl/Time.h>
//#include<hgl/graph/LookAtCameraControl.h>

2
inc/hgl/graph/InlineGeometry.h
View File

@ -4,7 +4,7 @@
#include<hgl/graph/VK.h>
#include<hgl/math/Vector.h>
#include<hgl/type/RectScope.h>
#include<hgl/type/Color4f.h>
#include<hgl/color/Color4f.h>
#include<hgl/graph/AABB.h>
namespace hgl
{

2
inc/hgl/graph/RenderList.h
View File

@ -7,7 +7,7 @@
#include<hgl/graph/RenderNode.h>
#include<hgl/graph/VKArrayBuffer.h>
#include<hgl/graph/SceneInfo.h>
#include<hgl/type/Color4f.h>
#include<hgl/color/Color4f.h>
#include<hgl/type/SortedSets.h>
namespace hgl
{

2
inc/hgl/graph/VKCommandBuffer.h
View File

@ -4,7 +4,7 @@
#include<hgl/graph/VK.h>
#include<hgl/graph/VKPipeline.h>
#include<hgl/graph/VKDescriptorSet.h>
#include<hgl/type/Color4f.h>
#include<hgl/color/Color4f.h>
VK_NAMESPACE_BEGIN
class GPUCmdBuffer
{

2
inc/hgl/graph/VKDebugMaker.h
View File

@ -2,7 +2,7 @@
#define HGL_GRAPH_VULKAN_DEBUG_MAKER_INCLUDE
#include<hgl/graph/VK.h>
#include<hgl/type/Color4f.h>
#include<hgl/color/Color4f.h>
VK_NAMESPACE_BEGIN
struct DebugMakerFunction

2
inc/hgl/graph/VKDebugUtils.h
View File

@ -2,7 +2,7 @@
#define HGL_GRAPH_VULKAN_DEBUG_UTILS_INCLUDE
#include<hgl/graph/VK.h>
#include<hgl/type/Color4f.h>
#include<hgl/color/Color4f.h>
VK_NAMESPACE_BEGIN
struct DebugUtilsFunction

22
inc/hgl/graph/VertexAttribDataAccess.h
View File

@ -1,8 +1,8 @@
#ifndef HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE
#define HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE
#include<hgl/type/Color3f.h>
#include<hgl/type/Color4f.h>
#include<hgl/color/Color3f.h>
#include<hgl/color/Color4f.h>
#include<hgl/type/RectScope.h>
#include<hgl/type/String.h>
#include<hgl/graph/VertexAttribData.h>
@ -60,7 +60,7 @@ namespace hgl
{
if(!data||offset>=count)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess::Get() out,offset:")+OSString::valueOf(offset));
LOG_HINT(OS_TEXT("VertexAttribDataAccess::Get() out,offset:")+OSString::numberOf(offset));
return(nullptr);
}
@ -76,7 +76,7 @@ namespace hgl
{
if(access)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess::Begin() access!=0,offset:")+OSString::valueOf(offset));
LOG_HINT(OS_TEXT("VertexAttribDataAccess::Begin() access!=0,offset:")+OSString::numberOf(offset));
return(nullptr);
}
@ -106,7 +106,7 @@ namespace hgl
{
if(!this->access||this->access+C*number>this->data_end)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess::Write(const T *,number) out,number:")+OSString::valueOf(number));
LOG_HINT(OS_TEXT("VertexAttribDataAccess::Write(const T *,number) out,number:")+OSString::numberOf(number));
return(false);
}
@ -201,7 +201,7 @@ namespace hgl
{
if(!this->access||this->access+count>this->data_end)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const T,")+OSString::valueOf(count)+OS_TEXT(") out"));
LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const T,")+OSString::numberOf(count)+OS_TEXT(") out"));
return(false);
}
@ -328,7 +328,7 @@ namespace hgl
{
if(!this->access||this->access+(count<<1)>this->data_end)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const Vector2f &,")+OSString::valueOf(count)+OS_TEXT(") out"));
LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const Vector2f &,")+OSString::numberOf(count)+OS_TEXT(") out"));
return(false);
}
@ -633,7 +633,7 @@ namespace hgl
{
if(!this->access||this->access+(count*3)>this->data_end)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out"));
LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::numberOf(count)+OS_TEXT(") out"));
return(false);
}
@ -657,7 +657,7 @@ namespace hgl
{
if(!this->access||this->access+(count*3)>this->data_end)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out"));
LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::numberOf(count)+OS_TEXT(") out"));
return(false);
}
@ -948,7 +948,7 @@ namespace hgl
{
if(!this->access||this->access+(count<<2)>this->data_end)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out"));
LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::numberOf(count)+OS_TEXT(") out"));
return(false);
}
@ -973,7 +973,7 @@ namespace hgl
{
if(!this->access||this->access+(count<<2)>this->data_end)
{
LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out"));
LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::numberOf(count)+OS_TEXT(") out"));
return(false);
}

2
inc/hgl/graph/font/TextRender.h
View File

@ -2,7 +2,7 @@
#define HGL_GRAPH_TEXT_RENDER_INCLUDE
#include<hgl/graph/VK.h>
#include<hgl/type/Color4f.h>
#include<hgl/color/Color4f.h>
namespace hgl
{

4
src/SceneGraph/Vulkan/VKDevice.cpp
View File

@ -16,7 +16,7 @@ void LogSurfaceFormat(const List<VkSurfaceFormatKHR> &surface_format_list)
const uint32_t format_count=surface_format_list.GetCount();
const VkSurfaceFormatKHR *sf=surface_format_list.GetData();
LOG_INFO(OS_TEXT("Current physics device support ")+OSString::valueOf(format_count)+OS_TEXT(" surface format"));
LOG_INFO(OS_TEXT("Current physics device support ")+OSString::numberOf(format_count)+OS_TEXT(" surface format"));
const VulkanFormat *vf;
const VulkanColorSpace *cs;
@ -26,7 +26,7 @@ void LogSurfaceFormat(const List<VkSurfaceFormatKHR> &surface_format_list)
vf=GetVulkanFormat(sf->format);
cs=GetVulkanColorSpace(sf->colorSpace);
LOG_INFO(" "+AnsiString::valueOf(i)+": "+AnsiString(vf->name)+", "+AnsiString(cs->name));
LOG_INFO(" "+AnsiString::numberOf(i)+": "+AnsiString(vf->name)+", "+AnsiString(cs->name));
++sf;
}

6
src/SceneGraph/Vulkan/VKPipelineCache.cpp
View File

@ -18,9 +18,9 @@ namespace
sl.Add(app_data);
sl.Add(OS_TEXT("VkPipelineCache.com"));
sl.Add(OSString::valueOf(VK_PIPELINE_CACHE_HEADER_VERSION_ONE));
sl.Add(OSString::valueOf(pdp.vendorID));
sl.Add(OSString::valueOf(pdp.deviceID));
sl.Add(OSString::numberOf(VK_PIPELINE_CACHE_HEADER_VERSION_ONE));
sl.Add(OSString::numberOf(pdp.vendorID));
sl.Add(OSString::numberOf(pdp.deviceID));
return ComboFilename(sl);
}

4
src/SceneGraph/Vulkan/VKRenderable.cpp
View File

@ -79,8 +79,8 @@ Renderable *CreateRenderable(Primitive *r,MaterialInstance *mi,Pipeline *p)
{
LOG_ERROR( "[FATAL ERROR] VBO \""+**name_list+
UTF8String("\" stride can't match Renderable, Material(")+mtl_name+
UTF8String(") stride(")+UTF8String::valueOf(bind_list->stride)+
UTF8String("), VBO stride(")+UTF8String::valueOf(vbo->GetStride())+
UTF8String(") stride(")+UTF8String::numberOf(bind_list->stride)+
UTF8String("), VBO stride(")+UTF8String::numberOf(vbo->GetStride())+
")");
return(nullptr);
}

2
src/SceneGraph/font/FontSourceWin.cpp
View File

@ -1,5 +1,5 @@
#include"FontSourceWin.h"
#include<hgl/type/ColorSpace.h>
#include<hgl/color/Gamma.h>
namespace hgl
{

2
src/SceneGraph/font/TextRender.cpp
View File

@ -3,7 +3,7 @@
#include<hgl/graph/font/TileFont.h>
#include<hgl/graph/font/TextLayout.h>
#include<hgl/graph/VKDevice.h>
#include<hgl/type/Color.h>
#include<hgl/color/Color.h>
namespace hgl
{