Compare commits
2 Commits
37cf314288
...
0c460842fc
| Author | SHA1 | Date | |
|---|---|---|---|
| 0c460842fc | |||
| d75957f2f5 |
10
fabula.cpp
10
fabula.cpp
@@ -163,9 +163,9 @@ void ustalPozycjeGracza(GLfloat gracz_x, GLfloat gracz_z, short &grid_x, short &
|
|||||||
void ustawSiatkeNaWzorNieNadpisujacPostepu() {
|
void ustawSiatkeNaWzorNieNadpisujacPostepu() {
|
||||||
for (int i = 0; i < 10; i++) {
|
for (int i = 0; i < 10; i++) {
|
||||||
for (int j = 0; j < 10; j++) {
|
for (int j = 0; j < 10; j++) {
|
||||||
bool ma_byc_zamalowana = wzory[biezacy_wzor][10*i + (10 - j)];
|
bool ma_byc_zamalowana = wzory[biezacy_wzor][10*i + (9 - j)];
|
||||||
if (ma_byc_zamalowana) siatka[10*i + (10 - j)] |= 1;
|
if (ma_byc_zamalowana) siatka[10*i + (9 - j)] |= 1;
|
||||||
else siatka[10*i + (10 - j)] = siatka[10*i + (10 - j)] - siatka[10*i + (10 - j)] % 2;
|
else siatka[10*i + (9 - j)] = siatka[10*i + (9 - j)] - siatka[10*i + (9 - j)] % 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -175,7 +175,7 @@ void nadpiszNowaSiatke(short nowy_wzor) {
|
|||||||
biezacy_wzor = nowy_wzor;
|
biezacy_wzor = nowy_wzor;
|
||||||
for (int i = 0; i < 10; i++) {
|
for (int i = 0; i < 10; i++) {
|
||||||
for (int j = 0; j < 10; j++) {
|
for (int j = 0; j < 10; j++) {
|
||||||
siatka[10*i + (10 - j)] = static_cast<unsigned short>(wzory[biezacy_wzor][10*i + (10 - j)]);
|
siatka[10*i + (9 - j)] = static_cast<unsigned short>(wzory[biezacy_wzor][10*i + (9 - j)]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -229,4 +229,4 @@ void aktualizujBiezacaKratke(short grid_x, short grid_z) {
|
|||||||
if (siatka[10*grid_x + (9 - grid_z)] != a) {
|
if (siatka[10*grid_x + (9 - grid_z)] != a) {
|
||||||
sprawdzPostepGry();
|
sprawdzPostepGry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -121,6 +121,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ClCompile Include="fabula.cpp" />
|
||||||
<ClCompile Include="FPSCounter.cpp" />
|
<ClCompile Include="FPSCounter.cpp" />
|
||||||
<ClCompile Include="glew.c" />
|
<ClCompile Include="glew.c" />
|
||||||
<ClCompile Include="Rover.cpp" />
|
<ClCompile Include="Rover.cpp" />
|
||||||
@@ -129,15 +130,18 @@
|
|||||||
<ClCompile Include="main.cpp" />
|
<ClCompile Include="main.cpp" />
|
||||||
<ClCompile Include="plane.cpp" />
|
<ClCompile Include="plane.cpp" />
|
||||||
<ClCompile Include="shader.cpp" />
|
<ClCompile Include="shader.cpp" />
|
||||||
|
<ClCompile Include="teksturowane.cpp" />
|
||||||
<ClCompile Include="texture.cpp" />
|
<ClCompile Include="texture.cpp" />
|
||||||
<ClCompile Include="timeh.cpp" />
|
<ClCompile Include="timeh.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ClInclude Include="fabula.hpp" />
|
||||||
<ClInclude Include="lazik.hpp" />
|
<ClInclude Include="lazik.hpp" />
|
||||||
<ClInclude Include="loadOBJ.h" />
|
<ClInclude Include="loadOBJ.h" />
|
||||||
<ClInclude Include="plane.hpp" />
|
<ClInclude Include="plane.hpp" />
|
||||||
<ClInclude Include="RESOURCE.H" />
|
<ClInclude Include="RESOURCE.H" />
|
||||||
<ClInclude Include="shader.hpp" />
|
<ClInclude Include="shader.hpp" />
|
||||||
|
<ClInclude Include="teksturowane.hpp" />
|
||||||
<ClInclude Include="texture.hpp" />
|
<ClInclude Include="texture.hpp" />
|
||||||
<ClInclude Include="timeh.hpp" />
|
<ClInclude Include="timeh.hpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -45,6 +45,12 @@
|
|||||||
<ClCompile Include="Rover.cpp">
|
<ClCompile Include="Rover.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="fabula.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="teksturowane.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="loadOBJ.h">
|
<ClInclude Include="loadOBJ.h">
|
||||||
@@ -68,6 +74,12 @@
|
|||||||
<ClInclude Include="texture.hpp">
|
<ClInclude Include="texture.hpp">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="fabula.hpp">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="teksturowane.hpp">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="glfw3.dll">
|
<None Include="glfw3.dll">
|
||||||
|
|||||||
Reference in New Issue
Block a user