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

排版、TAB转空格

Browse Source
This commit is contained in:
hyzboy 2019-05-07 10:44:26 +08:00
parent d229912b5b
commit 1ee9eef78c
6 changed files with 129 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/hgl/platform/Exit.h
View File

@ -3,8 +3,8 @@
namespace hgl
{
typedef int (*SignalAppExitFunc)(); //程序退出处理事件函数
typedef int (*SignalAppExitFunc)(); //程序退出处理事件函数
void SetSignalAppExit(SignalAppExitFunc); //设置程序退出处理事件函数
void SetSignalAppExit(SignalAppExitFunc); //设置程序退出处理事件函数
}//namespace hgl
#endif//HGL_EXIT_INCLUDE

4
src/Base/CMakeLists.txt
View File

@ -35,7 +35,7 @@ SET(BASE_OTHER_SOURCE
# Other/ExpendString.cpp
Other/ThreadFunc.cpp
Other/TimeCount.cpp
Other/TimeVal.cpp)
Other/TimeVal.cpp)
SOURCE_GROUP("Other" FILES ${BASE_OTHER_SOURCE})
@ -46,7 +46,7 @@ SET(BASE_PLUG_IN_SOURCE
SOURCE_GROUP("PlugIn" FILES ${BASE_PLUG_IN_SOURCE})
add_library(ULRE.Base SHARED #${SYSTEM_INFO_SOURCE}
add_library(ULRE.Base STATIC #${SYSTEM_INFO_SOURCE}
${BASE_TYPE_SOURCE}
${BASE_IO_SOURCE}
${BASE_FILE_SYSTEM_SOURCE}

12
src/Platform/CMakeLists.txt
View File

@ -62,7 +62,7 @@ IF(WIN32)
SET(PLATFORM_FILE_SOURCE Win/File.cpp
Win/FileAccess.cpp
Win/EnumFile.cpp
Win/EnumVolume.cpp
Win/EnumVolume.cpp
Win/ProgramPath.cpp)
SET(PLATFORM_CODEPAGE_SOURCE Win/CodePage.cpp)
@ -91,9 +91,9 @@ IF(WIN32)
SET(PLATFORM_DESKTOP_SOURCE Win/Desktop.cpp)
SET(PLATFORM_WINDOW_SOURCE Win/WinWindow.h
Win/WinWindow.cpp
Win/WinMessage.cpp
Win/WinVulkan.cpp)
Win/WinWindow.cpp
Win/WinMessage.cpp
Win/WinVulkan.cpp)
ENDIF(WIN32)
SET(PLATFORM_WINDOW_SOURCE ${PLATFORM_WINDOW_SOURCE} Window.cpp)
@ -113,7 +113,7 @@ SOURCE_GROUP("Window" FILES ${PLATFORM_WINDOW_SOURCE})
SET(PLATFORM_SOURCE ${PLATFORM_SOURCE}
${PLATFORM_FILE_SOURCE}
${PLATFORM_CODEPAGE_SOURCE}
#${PLATFORM_SYSTEM_INFO_SOURCE}
#${PLATFORM_SYSTEM_INFO_SOURCE}
${PLATFORM_APPLICATION_SOURCE}
${PLATFORM_LOG_SOURCE}
${PLATFORM_MULTI_THREAD_SOURCE}
@ -124,4 +124,4 @@ SET(PLATFORM_SOURCE ${PLATFORM_SOURCE}
${PLATFORM_WINDOW_SOURCE}
)
add_library(ULRE.Platform SHARED ${PLATFORM_SOURCE})
add_library(ULRE.Platform STATIC ${PLATFORM_SOURCE})

20
src/Platform/UNIX/Exit.cpp
View File

@ -3,22 +3,22 @@
namespace hgl
{
static SignalAppExitFunc app_exit_func=nullptr;
static SignalAppExitFunc app_exit_func=nullptr;
void exit_signal_proc(int n,siginfo_t *si,void *)
{
}
void exit_signal_proc(int n,siginfo_t *si,void *)
{
}
void SetSignalAppExit(SignalAppExitFunc func)
{
if(!func)return;
void SetSignalAppExit(SignalAppExitFunc func)
{
if(!func)return;
app_exit_func=func;
app_exit_func=func;
struct sigaction act;
struct sigaction act;
sigemptyset(&act.sa_mask); /** 清空阻塞信号 **/
act.sa_flags=SA_SIGINFO; /** 设置SA_SIGINFO 表示传递附加信息到触发函数 **/
act.sa_sigaction=exit_signal_proc;
}
}
}//namespace hgl

162
src/Platform/UNIX/LogConsole.cpp
View File

@ -10,117 +10,117 @@
namespace hgl
{
namespace logger
{
namespace logger
{
constexpr uint LOG_BUF_SIZE=4096;
/**
* unix控制台日志插件接口
*/
class LogUnixConsole:public Logger
{
char endline;
char log_buf[LOG_BUF_SIZE];
/**
* unix控制台日志插件接口
*/
class LogUnixConsole:public Logger
{
char endline;
char log_buf[LOG_BUF_SIZE];
#ifdef LOGINFO_THREAD_MUTEX
ThreadMutex mutex;
ThreadMutex mutex;
#endif//LOGINFO_THREAD_MUTEX
public:
public:
LogUnixConsole(LogLevel ll):Logger(ll)
{
endline='\n';
}
LogUnixConsole(LogLevel ll):Logger(ll)
{
endline='\n';
}
bool Create(const OSString &)
{
return(true);
}
bool Create(const OSString &)
{
return(true);
}
void Close(){}
void Close(){}
#ifdef LOG_INFO_THREAD
void WriteThreadID()
{
memcpy(log_buf,"[Thread:",8);
void WriteThreadID()
{
memcpy(log_buf,"[Thread:",8);
htos(log_buf+8,128-9,pthread_self());
strcat(log_buf,LOG_BUF_SIZE,']');
htos(log_buf+8,128-9,pthread_self());
strcat(log_buf,LOG_BUF_SIZE,']');
write(STDOUT_FILENO,log_buf,strlen(log_buf));
}
write(STDOUT_FILENO,log_buf,strlen(log_buf));
}
#endif//LOG_INFO_THREAD
#ifdef LOG_INFO_TIME
void WriteTime()
{
memcpy(log_buf,"[Time:",6);
void WriteTime()
{
memcpy(log_buf,"[Time:",6);
ftos(log_buf+6,128-strlen(log_buf),GetDoubleTime());
strcat(log_buf,LOG_BUF_SIZE,']');
ftos(log_buf+6,128-strlen(log_buf),GetDoubleTime());
strcat(log_buf,LOG_BUF_SIZE,']');
write(STDOUT_FILENO,log_buf,strlen(log_buf));
}
write(STDOUT_FILENO,log_buf,strlen(log_buf));
}
#endif//LOG_INFO_TIME
void Write(const u16char *str,int size)
{
#ifdef LOGINFO_THREAD_MUTEX
mutex.Lock();
#endif//LOGINFO_THREAD_MUTEX
void Write(const u16char *str,int size)
{
#ifdef LOGINFO_THREAD_MUTEX
mutex.Lock();
#endif//LOGINFO_THREAD_MUTEX
#ifdef LOG_INFO_THREAD
WriteThreadID();
#endif//LOG_INFO_THREAD
#ifdef LOG_INFO_THREAD
WriteThreadID();
#endif//LOG_INFO_THREAD
#ifdef LOG_INFO_TIME
WriteTime();
#endif//LOG_INFO_TIME
#ifdef LOG_INFO_TIME
WriteTime();
#endif//LOG_INFO_TIME
int len;
int len;
len=u16_to_u8(log_buf,LOG_BUF_SIZE,str,size);
len=u16_to_u8(log_buf,LOG_BUF_SIZE,str,size);
if(len>0)
{
log_buf[len++]='\n';
if(len>0)
{
log_buf[len++]='\n';
write(STDOUT_FILENO,log_buf,len);
}
#ifdef LOGINFO_THREAD_MUTEX
mutex.Unlock();
#endif//LOGINFO_THREAD_MUTEX
}
write(STDOUT_FILENO,log_buf,len);
}
#ifdef LOGINFO_THREAD_MUTEX
mutex.Unlock();
#endif//LOGINFO_THREAD_MUTEX
}
void Write(const char *str,int size)
{
#ifdef LOGINFO_THREAD_MUTEX
mutex.Lock();
#endif//LOGINFO_THREAD_MUTEX
void Write(const char *str,int size)
{
#ifdef LOGINFO_THREAD_MUTEX
mutex.Lock();
#endif//LOGINFO_THREAD_MUTEX
#ifdef LOG_INFO_THREAD
WriteThreadID();
#endif//LOG_INFO_THREAD
#ifdef LOG_INFO_THREAD
WriteThreadID();
#endif//LOG_INFO_THREAD
#ifdef LOG_INFO_TIME
WriteTime();
#endif//LOG_INFO_TIME
#ifdef LOG_INFO_TIME
WriteTime();
#endif//LOG_INFO_TIME
write(STDOUT_FILENO,str,size);
write(STDOUT_FILENO,&endline,1);
#ifdef LOGINFO_THREAD_MUTEX
mutex.Unlock();
#endif//LOGINFO_THREAD_MUTEX
}
};//class LogInterface
write(STDOUT_FILENO,str,size);
write(STDOUT_FILENO,&endline,1);
#ifdef LOGINFO_THREAD_MUTEX
mutex.Unlock();
#endif//LOGINFO_THREAD_MUTEX
}
};//class LogInterface
Logger *CreateLoggerConsole(const OSString &,LogLevel ll)
{
if(ll<llError)
return(nullptr);
Logger *CreateLoggerConsole(const OSString &,LogLevel ll)
{
if(ll<llError)
return(nullptr);
return(new LogUnixConsole(ll));
}
}//logger
return(new LogUnixConsole(ll));
}
}//logger
}//namespace hgl

56
src/RenderDevice/Vulkan/CMakeLists.txt
View File

@ -1,27 +1,27 @@
SET(RENDER_DEVICE_VULKAN_HEADER ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VK.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKBuffer.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKBufferData.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKCommandBuffer.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKDescriptorSets.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKDevice.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKDeviceAttribute.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKFence.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKFormat.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKFramebuffer.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKImageView.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKInstance.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKMaterial.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKPhysicalDevice.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKPipeline.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKPrimivate.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKRenderable.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKRenderPass.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKSemaphore.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderResource.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderModule.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderModuleManage.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKSurfaceExtensionName.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKVertexAttributeBinding.h)
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKBuffer.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKBufferData.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKCommandBuffer.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKDescriptorSets.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKDevice.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKDeviceAttribute.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKFence.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKFormat.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKFramebuffer.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKImageView.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKInstance.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKMaterial.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKPhysicalDevice.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKPipeline.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKPrimivate.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKRenderable.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKRenderPass.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKSemaphore.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderResource.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderModule.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderModuleManage.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKSurfaceExtensionName.h
${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKVertexAttributeBinding.h)
SET(RENDER_DEVICE_VULKAN_SOURCE VKFormat.cpp
VKInstance.cpp
@ -34,8 +34,8 @@ SET(RENDER_DEVICE_VULKAN_SOURCE VKFormat.cpp
VKDeviceBuffer.cpp
VKBuffer.cpp
VKDescriptorSets.cpp
VKDescriptorSetLayoutCreater.cpp
VKDescriptorSetLayoutCreater.h
VKDescriptorSetLayoutCreater.cpp
VKDescriptorSetLayoutCreater.h
VKRenderPass.cpp
VKShaderParse.h
VKShaderModule.cpp
@ -55,6 +55,6 @@ SOURCE_GROUP("Header Files" FILES ${RENDER_DEVICE_VULKAN_HEADER})
SOURCE_GROUP("Source Files" FILES ${RENDER_DEVICE_VULKAN_SOURCE})
#SOURCE_GROUP("JSON Source Files" FILES ${RENDER_DEVICE_VULKAN_JSON_SOURCE})
add_library(ULRE.RenderDevice.Vulkan SHARED ${RENDER_DEVICE_VULKAN_HEADER}
${RENDER_DEVICE_VULKAN_SOURCE}
${RENDER_DEVICE_VULKAN_JSON_SOURCE})
add_library(ULRE.RenderDevice.Vulkan STATIC ${RENDER_DEVICE_VULKAN_HEADER}
${RENDER_DEVICE_VULKAN_SOURCE}
${RENDER_DEVICE_VULKAN_JSON_SOURCE})