s473616/grafika_komputerowa
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prbTexture+ammo_count #10

Merged
s473616 merged 7 commits from prbTexture+ammo_count into master 2024-02-02 22:15:40 +01:00
Conversation 0 Commits 7 Files Changed 34 +12
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2a4d52c235 - Show all commits

11
grk/project/grk-project.vcxproj.filters
View File

@ -59,6 +59,7 @@
</ClCompile> </ClCompile>
<ClCompile Include="SpriteRenderer.cpp"> <ClCompile Include="SpriteRenderer.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Source.cpp"> <ClCompile Include="Source.cpp">
<Filter>Shader Files</Filter> <Filter>Shader Files</Filter>
</ClCompile> </ClCompile>
@ -122,6 +123,8 @@
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="SpriteRenderer.h"> <ClInclude Include="SpriteRenderer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ParticleSystem.h"> <ClInclude Include="ParticleSystem.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -157,6 +160,14 @@
<Filter>Shader Files</Filter> <Filter>Shader Files</Filter>
</None> </None>
<None Include="shaders\shader_sprite.vert"> <None Include="shaders\shader_sprite.vert">
<Filter>Shader Files</Filter>
</None>
<None Include="shaders\shader_tex.frag">
<Filter>Shader Files</Filter>
</None>
<None Include="shaders\shader_tex.vert">
<Filter>Shader Files</Filter>
</None>
<None Include="particle.frag"> <None Include="particle.frag">
<Filter>Shader Files</Filter> <Filter>Shader Files</Filter>
</None> </None>

1
grk/project/src/ex_9_1.hpp
View File

@ -62,6 +62,7 @@ GLuint programTest;
GLuint programSprite; GLuint programSprite;
GLuint programCubemap; GLuint programCubemap;
GLuint programParticle; GLuint programParticle;
GLuint programTex;
std::list<Planet*> planets; std::list<Planet*> planets;
Sun* sun; Sun* sun;