jack
/
parade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Got rid of some minor warnings

This commit is contained in:
Jack Christensen 2023-11-07 01:30:45 -05:00
parent 4983acd4eb
commit ad26ec7015
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Parade.vcxproj
View File

@ -28,7 +28,6 @@
<ClCompile Include="imgui\imgui_widgets.cpp" />
<ClCompile Include="src\Application.cpp" />
<ClCompile Include="src\Camera.cpp" />
<ClCompile Include="src\imgui_demo.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="imgui\.editorconfig" />
@ -119,8 +118,8 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)bin\$(Platform)$(Configuration)</OutDir>
<IntDir>$(SolutionDir)bin\intermediates\$(Platform)$(Configuration)</IntDir>
<OutDir>$(SolutionDir)bin\$(Platform)$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)bin\intermediates\$(Platform)$(Configuration)\</IntDir>
<IncludePath>C:\Users\Jack\parade\imgui;C:\Users\Jack\parade\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)lib</LibraryPath>
</PropertyGroup>

3
Parade.vcxproj.filters
View File

@ -42,9 +42,6 @@
<ClCompile Include="imgui\imgui_widgets.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="src\imgui_demo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="imgui\backends\imgui_impl_glfw.cpp">
<Filter>imgui</Filter>
</ClCompile>

2
imgui.ini
View File

@ -4,7 +4,7 @@ Size=400,400
Collapsed=0
[Window][Debug Window]
Pos=9,8
Pos=4,3
Size=785,130
Collapsed=0

10
src/Application.cpp
View File

@ -43,7 +43,7 @@ namespace scene
Camera camera;
unsigned int shader = -1;
float angle = glm::pi<float>() / 2.0;
float angle = glm::pi<float>() / 2.0f;
float yaw = -90.f;
float pitch = 0.f;
@ -56,9 +56,9 @@ namespace scene
glm::vec3 ka = { 0.25f, 0.25f, 0.25f }; // Object ambient color
glm::vec3 kd = { 193.0 / 255.0, 41.0 / 255.0, 46.0 / 255.0 }; // Object diffuse color
glm::vec3 ks = { 1.0f, 1.0f, 1.0f }; // Object specular color
int specular_exponent = 10.f;
int specular_exponent = 10;
float smoothing = 0.001f;
float smoothing = 0.0f;
glm::vec3 sphere_center = { 0.0, 0.0, 0.0 };
}
@ -104,7 +104,7 @@ static unsigned int CompileShader(unsigned int type, const std::string& source)
{
int length;
glGetShaderiv(id, GL_INFO_LOG_LENGTH, &length);
char* message = (char*)alloca(length * sizeof(char));
char* message = (char*)_malloca(length * sizeof(char));
glGetShaderInfoLog(id, length, &length, message);
std::cout << "Failed to compile " << (type == GL_VERTEX_SHADER ? "vertex" : "fragment") << " shader!" << std::endl;
std::cout << message << std::endl;
@ -303,7 +303,7 @@ void orbit_camera()
void pan_camera()
{
float translateSensitivity = 0.02;
float translateSensitivity = 0.02f;
scene::camera.pan((float)mouse::xoffset * -translateSensitivity, (float)mouse::yoffset * translateSensitivity);
}