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

renamed values' name

Browse Source
This commit is contained in:
hyzboy 2022-02-22 20:53:39 +08:00
parent 6feb8aa13f
commit 1fc1db4376
10 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/2dVector/line.cpp
View File

@ -11,7 +11,7 @@ constexpr uint32_t SCREEN_HEIGHT=720;
constexpr uint32_t VERTEX_COUNT=4; constexpr uint32_t VERTEX_COUNT=4;
constexpr float vertex_data[VERTEX_COUNT][2]= constexpr float position_data[VERTEX_COUNT][2]=
{ {
{SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25}, {SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25},
{SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75}, {SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75},
@ -79,7 +79,7 @@ private:
cam.width=extent.width; cam.width=extent.width;
cam.height=extent.height; cam.height=extent.height;
cam.Refresh(); cam.RefreshCameraInfo();
{ {
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global); MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
@ -116,7 +116,7 @@ private:
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false); if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
return(true); return(true);
@ -148,7 +148,7 @@ public:
cam.width=w; cam.width=w;
cam.height=h; cam.height=h;
cam.Refresh(); cam.RefreshCameraInfo();
ubo_camera_info->Write(&cam.info); ubo_camera_info->Write(&cam.info);

2
example/Vulkan/DrawText.cpp
View File

@ -34,7 +34,7 @@ private:
bool InitUBO() bool InitUBO()
{ {
const VkExtent2D extent=sc_render_target->GetExtent(); const VkExtent2D &extent=sc_render_target->GetExtent();
cam.width=extent.width; cam.width=extent.width;
cam.height=extent.height; cam.height=extent.height;

8
example/Vulkan/DrawTile.cpp
View File

@ -33,7 +33,7 @@ class TestApp:public VulkanApplicationFramework
TileData *tile_data=nullptr; TileData *tile_data=nullptr;
float *vertex_data=nullptr; float *position_data=nullptr;
float *tex_coord_data=nullptr; float *tex_coord_data=nullptr;
VkFormat tile_texture_format=PF_UNDEFINED; VkFormat tile_texture_format=PF_UNDEFINED;
@ -108,10 +108,10 @@ private:
const int count=tile_list.GetCount(); const int count=tile_list.GetCount();
TileBitmap **tb=tile_list.GetData(); TileBitmap **tb=tile_list.GetData();
vertex_data=new float[count*4]; position_data=new float[count*4];
tex_coord_data=new float[count*4]; tex_coord_data=new float[count*4];
float *vp=vertex_data; float *vp=position_data;
float *tp=tex_coord_data; float *tp=tex_coord_data;
int col=0; int col=0;
@ -215,7 +215,7 @@ private:
render_obj=db->CreateRenderable(tile_count); render_obj=db->CreateRenderable(tile_count);
if(!render_obj)return(false); if(!render_obj)return(false);
render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,vertex_data)); render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data));
render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data)); render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data));
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);

4
example/Vulkan/FragCoordTest.cpp
View File

@ -12,7 +12,7 @@ constexpr uint32_t SCREEN_HEIGHT=256;
constexpr uint32_t VERTEX_COUNT=4; constexpr uint32_t VERTEX_COUNT=4;
constexpr float vertex_data[VERTEX_COUNT][2]= constexpr float position_data[VERTEX_COUNT][2]=
{ {
{0,0}, {0,0},
{SCREEN_WIDTH,0}, {SCREEN_WIDTH,0},
@ -78,7 +78,7 @@ private:
auto render_obj=db->CreateRenderable(VERTEX_COUNT); auto render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false); if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
return(true); return(true);

4
example/Vulkan/RectanglePrimitive.cpp
View File

@ -19,7 +19,7 @@ constexpr uint32_t VERTEX_COUNT=1;
constexpr float BORDER=0.1f; constexpr float BORDER=0.1f;
constexpr float vertex_data[4]= constexpr float position_data[4]=
{ {
SCREEN_SIZE*BORDER, SCREEN_SIZE*BORDER, SCREEN_SIZE*BORDER, SCREEN_SIZE*BORDER,
SCREEN_SIZE*(1.0-BORDER), SCREEN_SIZE*(1.0-BORDER) SCREEN_SIZE*(1.0-BORDER), SCREEN_SIZE*(1.0-BORDER)
@ -109,7 +109,7 @@ private:
if(!render_obj)return(false); if(!render_obj)return(false);
render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,vertex_data)); render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data));
render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data)); render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data));
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);

4
example/Vulkan/first_triangle.cpp
View File

@ -14,7 +14,7 @@ constexpr uint32_t SCREEN_HEIGHT=720;
constexpr uint32_t VERTEX_COUNT=3; constexpr uint32_t VERTEX_COUNT=3;
constexpr float vertex_data[VERTEX_COUNT][2]= constexpr float position_data[VERTEX_COUNT][2]=
{ {
{SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25}, {SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25},
{SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75}, {SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75},
@ -85,7 +85,7 @@ private:
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false); if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);

4
example/Vulkan/indices_rect.cpp
View File

@ -14,7 +14,7 @@ constexpr uint32_t VERTEX_COUNT=4;
static Vector4f color(1,1,1,1); static Vector4f color(1,1,1,1);
constexpr float vertex_data[VERTEX_COUNT][2]= constexpr float position_data[VERTEX_COUNT][2]=
{ {
{0,0}, {0,0},
{SCREEN_WIDTH,0}, {SCREEN_WIDTH,0},
@ -87,7 +87,7 @@ private:
auto render_obj=db->CreateRenderable(VERTEX_COUNT); auto render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false); if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);

4
example/Vulkan/texture_rect.cpp
View File

@ -19,7 +19,7 @@ constexpr uint32_t SCREEN_HEIGHT=256;
constexpr uint32_t VERTEX_COUNT=4; constexpr uint32_t VERTEX_COUNT=4;
constexpr float vertex_data[VERTEX_COUNT][2]= constexpr float position_data[VERTEX_COUNT][2]=
{ {
{0, 0}, {0, 0},
{SCREEN_WIDTH, 0}, {SCREEN_WIDTH, 0},
@ -121,7 +121,7 @@ private:
auto render_obj=db->CreateRenderable(VERTEX_COUNT); auto render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false); if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V2F,VERTEX_COUNT,tex_coord_data)))return(false); if(!render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V2F,VERTEX_COUNT,tex_coord_data)))return(false);
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);

4
example/Vulkan/two_triangle.cpp
View File

@ -13,7 +13,7 @@ constexpr uint32_t SCREEN_HEIGHT=720;
constexpr uint32_t VERTEX_COUNT=3; constexpr uint32_t VERTEX_COUNT=3;
constexpr float vertex_data[VERTEX_COUNT][2]= constexpr float position_data[VERTEX_COUNT][2]=
{ {
{SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25}, {SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25},
{SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75}, {SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75},
@ -87,7 +87,7 @@ private:
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false); if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);

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

@ -5,8 +5,6 @@
#include<hgl/graph/font/TextRenderable.h> #include<hgl/graph/font/TextRenderable.h>
#include<hgl/graph/VKDevice.h> #include<hgl/graph/VKDevice.h>
constexpr uint CHAR_BITMAP_SIZE=16; //字符尺寸
namespace hgl namespace hgl
{ {
namespace graph namespace graph