merge with bubble
This commit is contained in:
parent
10b5d3407b
commit
03b4685e54
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -2,7 +2,7 @@
|
||||
<Project>
|
||||
<ProjectOutputs>
|
||||
<ProjectOutput>
|
||||
<FullPath>C:\Users\Anna Niczyporuk\source\repos\GRK_Projectnew\Debug\grk-cw9.exe</FullPath>
|
||||
<FullPath>C:\Users\sjule\source\repos\GRK_Project\Debug\grk-cw9.exe</FullPath>
|
||||
</ProjectOutput>
|
||||
</ProjectOutputs>
|
||||
<ContentFiles />
|
||||
|
@ -1 +1,63 @@
|
||||
grk-cw9.vcxproj -> C:\Users\Anna Niczyporuk\source\repos\GRK_Projectnew\Debug\grk-cw9.exe
|
||||
main.cpp
|
||||
C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
|
||||
C:\Users\sjule\source\repos\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123,1): message : see previous definition of 'APIENTRY'
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(281,30): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(295,17): warning C4101: 'data': unreferenced local variable
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(320,38): warning C4305: '=': truncation from 'double' to 'float'
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(349,16): warning C4305: 'initializing': truncation from 'double' to 'float'
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(537,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(545,73): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(545,66): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(560,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(574,98): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(577,68): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(609,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(623,99): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(626,69): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(718,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(727,108): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(735,87): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(735,223): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(756,2): warning C4305: 'argument': truncation from 'double' to 'float'
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(854,108): warning C4305: 'argument': truncation from 'double' to 'T'
|
||||
with
|
||||
[
|
||||
T=float
|
||||
]
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1118,21): warning C4305: '-=': truncation from 'double' to 'float'
|
||||
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1120,21): warning C4305: '+=': truncation from 'double' to '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
|
||||
grk-cw9.vcxproj -> C:\Users\sjule\source\repos\GRK_Project\Debug\grk-cw9.exe
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:
|
||||
Debug|Win32|C:\Users\Anna Niczyporuk\source\repos\GRK_Projectnew\|
|
||||
PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.34.31933:TargetPlatformVersion=10.0.22621.0:
|
||||
Debug|Win32|C:\Users\sjule\source\repos\GRK_Project\|
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user