poprawa
This commit is contained in:
parent
74e481c747
commit
373b2b2ca2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,33 +1,44 @@
|
|||||||
c:\software\vs19\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(513,5): warning MSB8028: The intermediate directory (Debug\) contains files shared from another project (grk-cw9.vcxproj). This can lead to incorrect clean and rebuild behavior.
|
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(513,5): warning MSB8028: Katalog pośredni (Debug\) zawiera pliki udostępnione z innego projektu (grk-cw9.vcxproj). Może to spowodować niepoprawne zachowanie podczas oczyszczania i ponownej kompilacji.
|
||||||
main.cpp
|
main.cpp
|
||||||
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
|
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra
|
||||||
J:\GrafikaKomputerowa\grk\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
|
C:\Users\Genos\Source\Repos\GRK_Room2\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(91,30): warning C4305: 'initializing': truncation from 'double' to 'float'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(94,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(112,38): warning C4305: '=': truncation from 'double' to 'float'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(109,38): warning C4305: "=": obcięcie z "double" do "float"
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(135,16): warning C4305: 'initializing': truncation from 'double' to 'float'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(132,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(154,15): warning C4101: 'textureID': unreferenced local variable
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(153,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(246,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(172,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(267,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(252,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(276,108): warning C4305: 'argument': truncation from 'double' to 'T'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(263,96): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
with
|
with
|
||||||
[
|
[
|
||||||
T=float
|
T=float
|
||||||
]
|
]
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(284,87): warning C4305: 'argument': truncation from 'double' to 'T'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(267,59): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
with
|
with
|
||||||
[
|
[
|
||||||
T=float
|
T=float
|
||||||
]
|
]
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(284,223): warning C4305: 'argument': truncation from 'double' to 'float'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(343,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(287,59): warning C4305: 'argument': truncation from 'double' to 'T'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(353,108): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
with
|
with
|
||||||
[
|
[
|
||||||
T=float
|
T=float
|
||||||
]
|
]
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(288,37): warning C4305: 'argument': truncation from 'double' to 'float'
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(361,87): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(316,2): warning C4305: 'argument': truncation from 'double' to 'float'
|
with
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(421,21): warning C4305: '-=': truncation from 'double' to 'float'
|
[
|
||||||
J:\GrafikaKomputerowa\grk\cw 9\src\room.hpp(423,21): warning C4305: '+=': truncation from 'double' to 'float'
|
T=float
|
||||||
Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
|
]
|
||||||
LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(361,223): warning C4305: "argument": obcięcie z "double" do "float"
|
||||||
grk-cw9.vcxproj -> J:\GrafikaKomputerowa\grk\Debug\room.exe
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(364,59): warning C4305: "argument": obcięcie z "double" do "T"
|
||||||
|
with
|
||||||
|
[
|
||||||
|
T=float
|
||||||
|
]
|
||||||
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(365,37): warning C4305: "argument": obcięcie z "double" do "float"
|
||||||
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(393,2): warning C4305: "argument": obcięcie z "double" do "float"
|
||||||
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(501,21): warning C4305: "-=": obcięcie z "double" do "float"
|
||||||
|
C:\Users\Genos\source\repos\GRK_Room2\cw 9\src\room.hpp(503,21): warning C4305: "+=": obcięcie z "double" do "float"
|
||||||
|
Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO”
|
||||||
|
LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka
|
||||||
|
grk-cw9.vcxproj -> C:\Users\Genos\Source\Repos\GRK_Room2\Debug\room.exe
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -2,7 +2,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<ProjectOutputs>
|
<ProjectOutputs>
|
||||||
<ProjectOutput>
|
<ProjectOutput>
|
||||||
<FullPath>J:\GrafikaKomputerowa\grk\Debug\room.exe</FullPath>
|
<FullPath>C:\Users\Genos\Source\Repos\GRK_Room2\Debug\room.exe</FullPath>
|
||||||
</ProjectOutput>
|
</ProjectOutput>
|
||||||
</ProjectOutputs>
|
</ProjectOutputs>
|
||||||
<ContentFiles />
|
<ContentFiles />
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
|||||||
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
|
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
|
||||||
Debug|Win32|J:\GrafikaKomputerowa\grk\|
|
Debug|Win32|C:\Users\Genos\Source\Repos\GRK_Room2\|
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -14,5 +14,6 @@ float rescale_z(float z){
|
|||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
float depthValue = texture(depthMap, tc).r;
|
float depthValue = texture(depthMap, tc).r;
|
||||||
FragColor = vec4(vec3(rescale_z(depthValue)+0.5), 1.0);
|
//FragColor = vec4(vec3(rescale_z(depthValue)+0.5), 1.0);
|
||||||
|
FragColor = vec4(vec3((depthValue)+0.5), 1.0);
|
||||||
}
|
}
|
@ -93,7 +93,7 @@ glm::vec3 spotlightConeDir = glm::vec3(0, 0, 0);
|
|||||||
glm::vec3 spotlightColor = glm::vec3(1.0, 1.0, 1.0)*10;
|
glm::vec3 spotlightColor = glm::vec3(1.0, 1.0, 1.0)*10;
|
||||||
float spotlightPhi = 3.14 / 4;
|
float spotlightPhi = 3.14 / 4;
|
||||||
|
|
||||||
glm::mat4 lightVP = glm::ortho(-3.f, 3.f, -3.f, 3.f, 1.0f, 20.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0));
|
glm::mat4 lightVP = glm::ortho(-3.f, 3.f, -3.f, 4.f, -10.0f, 20.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0));
|
||||||
glm::mat4 lightShipVP;
|
glm::mat4 lightShipVP;
|
||||||
|
|
||||||
float lastTime = -1.f;
|
float lastTime = -1.f;
|
||||||
|
Loading…
Reference in New Issue
Block a user