Minor updates
This commit is contained in:
parent
22deb5a7ad
commit
11dc2deb2f
@ -4,7 +4,7 @@
|
|||||||
using namespace nf;
|
using namespace nf;
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
Config conf = { 1280, 720, false, "Test"};
|
Config conf = { 1280, 720, false, "Example Game"};
|
||||||
Application app(conf);
|
Application app(conf);
|
||||||
//app.setWindowIcon(...);
|
//app.setWindowIcon(...);
|
||||||
// app.setWindowCursor(...);
|
// app.setWindowCursor(...);
|
||||||
|
@ -205,7 +205,7 @@
|
|||||||
<ClInclude Include="src\include\Utility.h" />
|
<ClInclude Include="src\include\Utility.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Natvis Include="src\NatvisFile.natvis" />
|
<Natvis Include="NatvisFile.natvis" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
@ -49,6 +49,6 @@
|
|||||||
</ClInclude>
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Natvis Include="src\NatvisFile.natvis" />
|
<Natvis Include="NatvisFile.natvis" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
@ -234,6 +234,7 @@ namespace nf {
|
|||||||
case WM_MENUCHAR: {
|
case WM_MENUCHAR: {
|
||||||
return MNC_CLOSE << 16;
|
return MNC_CLOSE << 16;
|
||||||
}
|
}
|
||||||
|
//TODO: mouse position input
|
||||||
case WM_LBUTTONDOWN: {
|
case WM_LBUTTONDOWN: {
|
||||||
app->m_input[1] = true;
|
app->m_input[1] = true;
|
||||||
return 0;
|
return 0;
|
||||||
@ -280,7 +281,6 @@ namespace nf {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return DefWindowProc(hWnd, uMsg, wParam, lParam);
|
return DefWindowProc(hWnd, uMsg, wParam, lParam);
|
||||||
//TODO: Fill out events
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::createOpenGLContext() {
|
void Application::createOpenGLContext() {
|
||||||
@ -322,6 +322,7 @@ namespace nf {
|
|||||||
wglMakeCurrent(m_hdc, m_hglrc);
|
wglMakeCurrent(m_hdc, m_hglrc);
|
||||||
wglSwapIntervalEXT(0);
|
wglSwapIntervalEXT(0);
|
||||||
Log("OpenGL version: " + std::string((char*)glGetString(GL_VERSION)));
|
Log("OpenGL version: " + std::string((char*)glGetString(GL_VERSION)));
|
||||||
|
//TODO: Move default vertex array to Renderer
|
||||||
GLuint vao;
|
GLuint vao;
|
||||||
glGenVertexArrays(1, &vao);
|
glGenVertexArrays(1, &vao);
|
||||||
glBindVertexArray(vao);
|
glBindVertexArray(vao);
|
||||||
|
@ -17,10 +17,11 @@ Remember to use tasks (//TODO: )
|
|||||||
*Namespaced
|
*Namespaced
|
||||||
*Debug and log system
|
*Debug and log system
|
||||||
*NatVis
|
*NatVis
|
||||||
Config changing
|
*Config changing
|
||||||
*Alt-Enter
|
*Alt-Enter
|
||||||
*File IO functions
|
*File IO functions
|
||||||
Input (mouse position)
|
*Keyboard and mouse click input
|
||||||
|
Mouse position input
|
||||||
Audio
|
Audio
|
||||||
*Game states
|
*Game states
|
||||||
Text rendering
|
Text rendering
|
||||||
|
Reference in New Issue
Block a user