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

更新范例测试程序到最新的VBO/VAO/Renderable上

Browse Source
This commit is contained in:
HuYingzhuo 2019-03-27 21:14:23 +08:00
parent 701c6c39a9
commit 403499e1f1
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
example/DirectGLTexture/main.cpp
View File

@ -2,10 +2,7 @@
#include<hgl/graph/RenderDriver.h> #include<hgl/graph/RenderDriver.h>
#include<hgl/graph/RenderWindow.h> #include<hgl/graph/RenderWindow.h>
#include<iostream> #include<iostream>
#include<GLEWCore/glew.h> #include<hgl/graph/Renderable.h>
#include<hgl/graph/Shader.h>
#include<hgl/math/Math.h>
#include<hgl/graph/VertexArray.h>
using namespace hgl; using namespace hgl;
using namespace hgl::graph; using namespace hgl::graph;
@ -70,9 +67,10 @@ bool InitShader()
return(true); return(true);
} }
VB2f *vb_vertex=nullptr; ArrayBuffer *vb_vertex=nullptr;
VB2f *vb_texcoord=nullptr; ArrayBuffer *vb_texcoord=nullptr;
VertexArray *va=nullptr; VertexArray *va=nullptr;
Renderable *render_obj=nullptr;
constexpr float vertex_data[]={ -0.75f, 0.75f, constexpr float vertex_data[]={ -0.75f, 0.75f,
-0.75f,-0.75f, -0.75f,-0.75f,
@ -87,17 +85,18 @@ constexpr float texcoord_data[]={ 0,0,
void InitVertexBuffer() void InitVertexBuffer()
{ {
vb_vertex=new VB2f(4,vertex_data); vb_vertex=CreateVBO(VB2f(4,vertex_data));
vb_texcoord=new VB2f(4,texcoord_data); vb_texcoord=CreateVBO(VB2f(4,texcoord_data));
va=new VertexArray(GL_TRIANGLE_STRIP, //画三角形条 va=new VertexArray();
2); //两个属性
const int vertex_location=shader.GetAttribLocation("Vertex"); ///<取得顶点数据输入流对应的shader地址 const int vertex_location=shader.GetAttribLocation("Vertex"); ///<取得顶点数据输入流对应的shader地址
const int texcoord_location=shader.GetAttribLocation("TexCoord"); ///<取得纹理坐标数据输入流对应的shader地址 const int texcoord_location=shader.GetAttribLocation("TexCoord"); ///<取得纹理坐标数据输入流对应的shader地址
va->SetVertexBuffer(vertex_location,vb_vertex); va->SetPosition(vertex_location,vb_vertex);
va->AddVertexAttribBuffer(texcoord_location,vb_texcoord); va->AddBuffer(texcoord_location,vb_texcoord);
render_obj=new Renderable(GL_TRIANGLE_STRIP,va);
} }
bool InitTexture() bool InitTexture()
@ -129,7 +128,7 @@ void draw()
glClearBufferfv(GL_COLOR,0,clear_color); glClearBufferfv(GL_COLOR,0,clear_color);
glClearBufferfv(GL_DEPTH,0,&clear_depth); glClearBufferfv(GL_DEPTH,0,&clear_depth);
va->Draw(); render_obj->Draw();
} }
int main(void) int main(void)
@ -181,6 +180,11 @@ int main(void)
win->PollEvent(); //处理窗口事件 win->PollEvent(); //处理窗口事件
} }
delete render_obj;
delete va;
delete vb_texcoord;
delete vb_vertex;
delete win; delete win;
delete device; delete device;

30
example/TextureSampler/main.cpp
View File

@ -2,10 +2,7 @@
#include<hgl/graph/RenderDriver.h> #include<hgl/graph/RenderDriver.h>
#include<hgl/graph/RenderWindow.h> #include<hgl/graph/RenderWindow.h>
#include<iostream> #include<iostream>
#include<GLEWCore/glew.h> #include<hgl/graph/Renderable.h>
#include<hgl/graph/Shader.h>
#include<hgl/math/Math.h>
#include<hgl/graph/VertexArray.h>
using namespace hgl; using namespace hgl;
using namespace hgl::graph; using namespace hgl::graph;
@ -72,9 +69,10 @@ bool InitShader()
return(true); return(true);
} }
VB2f *vb_vertex=nullptr; ArrayBuffer *vb_vertex=nullptr;
VB2f *vb_texcoord=nullptr; ArrayBuffer *vb_texcoord=nullptr;
VertexArray *va=nullptr; VertexArray *va=nullptr;
Renderable *render_obj=nullptr;
constexpr float vertex_data[]={ -0.75f, 0.75f, constexpr float vertex_data[]={ -0.75f, 0.75f,
-0.75f,-0.75f, -0.75f,-0.75f,
@ -90,17 +88,18 @@ constexpr float texcoord_data[]={ -0.25,-0.25,
void InitVertexBuffer() void InitVertexBuffer()
{ {
vb_vertex=new VB2f(4,vertex_data); vb_vertex=CreateVBO(VB2f(4,vertex_data));
vb_texcoord=new VB2f(4,texcoord_data); vb_texcoord=CreateVBO(VB2f(4,texcoord_data));
va=new VertexArray(GL_TRIANGLE_STRIP, //画三角形条 va=new VertexArray();
2); //两个属性
const int vertex_location=shader.GetAttribLocation("Vertex"); ///<取得顶点数据输入流对应的shader地址 const int vertex_location=shader.GetAttribLocation("Vertex"); ///<取得顶点数据输入流对应的shader地址
const int texcoord_location=shader.GetAttribLocation("TexCoord"); ///<取得纹理坐标数据输入流对应的shader地址 const int texcoord_location=shader.GetAttribLocation("TexCoord"); ///<取得纹理坐标数据输入流对应的shader地址
va->SetVertexBuffer(vertex_location,vb_vertex); va->SetPosition(vertex_location,vb_vertex);
va->AddVertexAttribBuffer(texcoord_location,vb_texcoord); va->AddBuffer(texcoord_location,vb_texcoord);
render_obj=new Renderable(GL_TRIANGLE_STRIP,va);
} }
bool InitTexture() bool InitTexture()
@ -137,7 +136,7 @@ void draw()
glClearBufferfv(GL_COLOR,0,clear_color); glClearBufferfv(GL_COLOR,0,clear_color);
glClearBufferfv(GL_DEPTH,0,&clear_depth); glClearBufferfv(GL_DEPTH,0,&clear_depth);
va->Draw(); render_obj->Draw();
} }
int main(void) int main(void)
@ -189,6 +188,11 @@ int main(void)
win->PollEvent(); //处理窗口事件 win->PollEvent(); //处理窗口事件
} }
delete render_obj;
delete va;
delete vb_texcoord;
delete vb_vertex;
delete win; delete win;
delete device; delete device;