diff --git a/Game/src/Game.cpp b/Game/src/Game.cpp index 29554ef..c8a9eed 100644 --- a/Game/src/Game.cpp +++ b/Game/src/Game.cpp @@ -4,7 +4,7 @@ using namespace nf; int main(int argc, char* argv[]) { - Config conf = { 1280, 720, false, "Test"}; + Config conf = { 1280, 720, false, "Example Game"}; Application app(conf); //app.setWindowIcon(...); // app.setWindowCursor(...); diff --git a/NothinFancy/src/NatvisFile.natvis b/NothinFancy/NatvisFile.natvis similarity index 100% rename from NothinFancy/src/NatvisFile.natvis rename to NothinFancy/NatvisFile.natvis diff --git a/NothinFancy/NothinFancy.vcxproj b/NothinFancy/NothinFancy.vcxproj index 2b54896..f1c08cb 100644 --- a/NothinFancy/NothinFancy.vcxproj +++ b/NothinFancy/NothinFancy.vcxproj @@ -205,7 +205,7 @@ <ClInclude Include="src\include\Utility.h" /> </ItemGroup> <ItemGroup> - <Natvis Include="src\NatvisFile.natvis" /> + <Natvis Include="NatvisFile.natvis" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/NothinFancy/NothinFancy.vcxproj.filters b/NothinFancy/NothinFancy.vcxproj.filters index d07be53..908f155 100644 --- a/NothinFancy/NothinFancy.vcxproj.filters +++ b/NothinFancy/NothinFancy.vcxproj.filters @@ -49,6 +49,6 @@ </ClInclude> </ItemGroup> <ItemGroup> - <Natvis Include="src\NatvisFile.natvis" /> + <Natvis Include="NatvisFile.natvis" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/NothinFancy/src/Application.cpp b/NothinFancy/src/Application.cpp index a67505b..1aef96f 100644 --- a/NothinFancy/src/Application.cpp +++ b/NothinFancy/src/Application.cpp @@ -234,6 +234,7 @@ namespace nf { case WM_MENUCHAR: { return MNC_CLOSE << 16; } + //TODO: mouse position input case WM_LBUTTONDOWN: { app->m_input[1] = true; return 0; @@ -280,7 +281,6 @@ namespace nf { } } return DefWindowProc(hWnd, uMsg, wParam, lParam); - //TODO: Fill out events } void Application::createOpenGLContext() { @@ -322,6 +322,7 @@ namespace nf { wglMakeCurrent(m_hdc, m_hglrc); wglSwapIntervalEXT(0); Log("OpenGL version: " + std::string((char*)glGetString(GL_VERSION))); + //TODO: Move default vertex array to Renderer GLuint vao; glGenVertexArrays(1, &vao); glBindVertexArray(vao); diff --git a/notes.txt b/notes.txt index f1d4d84..86822e2 100644 --- a/notes.txt +++ b/notes.txt @@ -17,10 +17,11 @@ Remember to use tasks (//TODO: ) *Namespaced *Debug and log system *NatVis -Config changing +*Config changing *Alt-Enter *File IO functions -Input (mouse position) +*Keyboard and mouse click input +Mouse position input Audio *Game states Text rendering