blobt
/
renderFramework
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

修复framework bug，实现RGB Cube

master
blobt 4 years ago
parent
85f7511207
commit
79bc1ac863
7 changed files with 83 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Res/rgbcube.fs
  2. 12
      Res/rgbcube.vs
  3. 6
      model.cpp
  4. 9
      renderFramework.vcxproj
  5. 65
      renderFramework.vcxproj.filters
  6. 13
      scene.cpp
  7. 2
      shader.cpp

8
Res/rgbcube.fs
View File

@ -0,0 +1,8 @@
#ifdef GL_ES
precision mediump float;
#endif
varying vec4 V_Color;
void main()
{
gl_FragColor=V_Color;
}

12
Res/rgbcube.vs
View File

@ -0,0 +1,12 @@
#ifdef GL_ES
precision mediump float;
#endif;
attribute vec4 position;
uniform mat4 ModelMatrix;
uniform mat4 ViewMatrix;
uniform mat4 ProjectionMatrix;
varying vec4 V_Color;
void main(){
V_Color = vec4(position.x + 0.5, position.y+0.5, position.z +0.5, 1.0);
gl_Position = ProjectionMatrix * ViewMatrix * ModelMatrix * position;
}

6
model.cpp
View File

@ -141,11 +141,11 @@ void Model::createVertexBuffer()
glm::float3 t; glm::float3 t;
mVertexBuffer->SetSize(vertexCount); mVertexBuffer->SetSize(vertexCount);
for (int i = 0; i < vertexCount; ++i) { for (int i = 0; i < vertexCount; ++i) {
t = position[vertices[i].position - 1];
t = position[vertices[i].position];
mVertexBuffer->SetPosition(i, t[0], t[1], t[2]); mVertexBuffer->SetPosition(i, t[0], t[1], t[2]);
t = texcoord[vertices[i].texcoord - 1];
t = texcoord[vertices[i].texcoord];
mVertexBuffer->SetTexcoord(i, t[0], t[1]); mVertexBuffer->SetTexcoord(i, t[0], t[1]);
t = normal[vertices[i].normal - 1];
t = normal[vertices[i].normal];
mVertexBuffer->SetNormal(i, t[0], t[1], t[2]); mVertexBuffer->SetNormal(i, t[0], t[1], t[2]);
} }
} }

9
renderFramework.vcxproj
View File

@ -82,6 +82,9 @@
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
</Link> </Link>
<PostBuildEvent>
<Command>editbin /subsystem:console $(OutDir)$(ProjectName).exe</Command>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
@ -127,6 +130,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="framebufferobject.cpp" /> <ClCompile Include="framebufferobject.cpp" />
<ClCompile Include="fullscreenquad.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="model.cpp" /> <ClCompile Include="model.cpp" />
<ClCompile Include="scene.cpp" /> <ClCompile Include="scene.cpp" />
@ -136,6 +140,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="framebufferobject.h" /> <ClInclude Include="framebufferobject.h" />
<ClInclude Include="fullscreenquad.h" />
<ClInclude Include="ggl.h" /> <ClInclude Include="ggl.h" />
<ClInclude Include="model.h" /> <ClInclude Include="model.h" />
<ClInclude Include="scene.h" /> <ClInclude Include="scene.h" />
@ -143,6 +148,10 @@
<ClInclude Include="utils.h" /> <ClInclude Include="utils.h" />
<ClInclude Include="vertexbuffer.h" /> <ClInclude Include="vertexbuffer.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Res\rgbcube.fs" />
<None Include="Res\rgbcube.vs" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

65
renderFramework.vcxproj.filters
View File

@ -5,13 +5,8 @@
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter> </Filter>
<Filter Include="头文件">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="资源文件">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
<Filter Include="framework">
<UniqueIdentifier>{a3e69115-b076-4917-a38c-f8c6f3a7021c}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -21,43 +16,57 @@
<ClCompile Include="scene.cpp"> <ClCompile Include="scene.cpp">
<Filter>源文件</Filter> <Filter>源文件</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="utils.cpp">
<Filter>源文件</Filter>
<ClCompile Include="framebufferobject.cpp">
<Filter>framework</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="vertexbuffer.cpp">
<Filter>源文件</Filter>
<ClCompile Include="fullscreenquad.cpp">
<Filter>framework</Filter>
</ClCompile>
<ClCompile Include="model.cpp">
<Filter>framework</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="shader.cpp"> <ClCompile Include="shader.cpp">
<Filter>源文件</Filter>
<Filter>framework</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="model.cpp">
<Filter>源文件</Filter>
<ClCompile Include="utils.cpp">
<Filter>framework</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="framebufferobject.cpp">
<Filter>源文件</Filter>
<ClCompile Include="vertexbuffer.cpp">
<Filter>framework</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="ggl.h">
<Filter>源文件</Filter>
</ClInclude>
<ClInclude Include="scene.h"> <ClInclude Include="scene.h">
<Filter>源文件</Filter> <Filter>源文件</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="utils.h">
<Filter>源文件</Filter>
<ClInclude Include="framebufferobject.h">
<Filter>framework</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="vertexbuffer.h">
<Filter>源文件</Filter>
<ClInclude Include="fullscreenquad.h">
<Filter>framework</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="shader.h">
<Filter>源文件</Filter>
<ClInclude Include="ggl.h">
<Filter>framework</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="model.h"> <ClInclude Include="model.h">
<Filter>源文件</Filter>
<Filter>framework</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="framebufferobject.h">
<Filter>源文件</Filter>
<ClInclude Include="shader.h">
<Filter>framework</Filter>
</ClInclude>
<ClInclude Include="utils.h">
<Filter>framework</Filter>
</ClInclude>
<ClInclude Include="vertexbuffer.h">
<Filter>framework</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Res\rgbcube.fs">
<Filter>源文件</Filter>
</None>
<None Include="Res\rgbcube.vs">
<Filter>源文件</Filter>
</None>
</ItemGroup>
</Project> </Project>

13
scene.cpp
View File

@ -1,13 +1,26 @@
#include "scene.h" #include "scene.h"
#include "utils.h"
#include "model.h"
glm::mat4 viewMatrix, projectionMatrix;
glm::vec3 cameraPos(4.0f, 3.0f, 4.0f);
Model model;
void Init() void Init()
{ {
model.Init("Res/Cube.obj");
model.mShader->Init("Res/rgbcube.vs", "Res/rgbcube.fs");
model.SetPosition(0.0f, 0.0f, 0.0f);
viewMatrix = glm::lookAt(cameraPos, glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
} }
void SetViewPortSize(float width, float height) void SetViewPortSize(float width, float height)
{ {
projectionMatrix = glm::perspective(50.0f, width/height, 0.1f, 1000.0f);
} }
void Draw() void Draw()
{ {
glClearColor(0.0f,0.0f,0.0f,1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
model.Draw(viewMatrix, projectionMatrix, cameraPos.x, cameraPos.y, cameraPos.z);
} }

2
shader.cpp
View File

@ -45,7 +45,7 @@ void Shader::Init(const char * vs, const char * fs)
{ {
int nFileSize = 0; int nFileSize = 0;
const char* vsCode = (char*)LoadFileContent(vs, nFileSize); const char* vsCode = (char*)LoadFileContent(vs, nFileSize);
const char* fsCode = (char*)LoadFileContent(vs, nFileSize);
const char* fsCode = (char*)LoadFileContent(fs, nFileSize);
GLuint vsShader = CompileShader(GL_VERTEX_SHADER, vsCode); GLuint vsShader = CompileShader(GL_VERTEX_SHADER, vsCode);
if (vsShader == 0) { if (vsShader == 0) {
return; return;

Write Preview
Loading…
Cancel
Save