kts
/
7DRL2015
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated VS project and removed a debug line of spammage.

master
kts 2015-04-03 19:36:00 -07:00
parent 191814cb7f
commit 7a739584dc
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/vs/7DRL2015.vcxproj
View File

@ -82,6 +82,7 @@ xcopy /s /e /d /y "..\..\data" "$(OutDir)data\"</Command>
<ClCompile Include="..\..\src\abilities\Ability.cpp" /> <ClCompile Include="..\..\src\abilities\Ability.cpp" />
<ClCompile Include="..\..\src\abilities\GodHand.cpp" /> <ClCompile Include="..\..\src\abilities\GodHand.cpp" />
<ClCompile Include="..\..\src\abilities\VampiricNom.cpp" /> <ClCompile Include="..\..\src\abilities\VampiricNom.cpp" />
<ClCompile Include="..\..\src\AiController.cpp" />
<ClCompile Include="..\..\src\Controller.cpp" /> <ClCompile Include="..\..\src\Controller.cpp" />
<ClCompile Include="..\..\src\Core.cpp" /> <ClCompile Include="..\..\src\Core.cpp" />
<ClCompile Include="..\..\src\fio.cpp" /> <ClCompile Include="..\..\src\fio.cpp" />
@ -117,6 +118,7 @@ xcopy /s /e /d /y "..\..\data" "$(OutDir)data\"</Command>
<ClInclude Include="..\..\src\abilities\Ability.hpp" /> <ClInclude Include="..\..\src\abilities\Ability.hpp" />
<ClInclude Include="..\..\src\abilities\GodHand.hpp" /> <ClInclude Include="..\..\src\abilities\GodHand.hpp" />
<ClInclude Include="..\..\src\abilities\VampiricNom.hpp" /> <ClInclude Include="..\..\src\abilities\VampiricNom.hpp" />
<ClInclude Include="..\..\src\AiController.hpp" />
<ClInclude Include="..\..\src\common.hpp" /> <ClInclude Include="..\..\src\common.hpp" />
<ClInclude Include="..\..\src\Controller.hpp" /> <ClInclude Include="..\..\src\Controller.hpp" />
<ClInclude Include="..\..\src\Core.hpp" /> <ClInclude Include="..\..\src\Core.hpp" />

6
build/vs/7DRL2015.vcxproj.filters
View File

@ -129,6 +129,9 @@
<ClCompile Include="..\..\src\abilities\VampiricNom.cpp"> <ClCompile Include="..\..\src\abilities\VampiricNom.cpp">
<Filter>Classes\Abilities</Filter> <Filter>Classes\Abilities</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\AiController.cpp">
<Filter>Classes</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\Controller.hpp"> <ClInclude Include="..\..\src\Controller.hpp">
@ -233,5 +236,8 @@
<ClInclude Include="..\..\src\abilities\VampiricNom.hpp"> <ClInclude Include="..\..\src\abilities\VampiricNom.hpp">
<Filter>Classes\Abilities</Filter> <Filter>Classes\Abilities</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\AiController.hpp">
<Filter>Classes</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

1
src/render/Ui.cpp
View File

@ -22,6 +22,7 @@ Ui::Ui(const char *filename, int width_, int height_) {
transparency = 0.0f; transparency = 0.0f;
vertical_fade = 0.0f; vertical_fade = 0.0f;
setImage(filename, width_, height_); setImage(filename, width_, height_);
angle = 0.0f;
} }
Ui::~Ui() { Ui::~Ui() {
LOG(LOG_INFO); LOG(LOG_INFO);

1
src/states/UiSubState.cpp
View File

@ -78,7 +78,6 @@ int UiSubState::doRender() {
glUniform1f(ui_program_transparency, ui->transparency); glUniform1f(ui_program_transparency, ui->transparency);
// send fade amount // send fade amount
glUniform1f(ui_program_v_fade, ui->vertical_fade); glUniform1f(ui_program_v_fade, ui->vertical_fade);
LOG(LOG_INFO) << "vfade is " << ui->vertical_fade;
// draw // draw
glDrawArrays(GL_TRIANGLES, 0, mesh->vertices.size()); glDrawArrays(GL_TRIANGLES, 0, mesh->vertices.size());
} }