grayson/NFRev1
Archived
1
0 Fork 0
Code Issues Actions Packages Releases Activity

Added Model and default shader; Organization

Browse Source
This commit is contained in:
grayson committed 2021-08-26 00:23:56 -05:00
1 parent 1c638bdcb9
commit d74f808a17
23 files changed
+293 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/Game.vcxproj
+8
View File
@@ -105,6 +105,8 @@
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
<AdditionalLibraryDirectories>$(ProjectDir)dep\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>nf.res;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -126,6 +128,8 @@
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
<AdditionalLibraryDirectories>$(ProjectDir)dep\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>nf.res;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -143,6 +147,8 @@
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
<AdditionalLibraryDirectories>$(ProjectDir)dep\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>nf.res;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -164,6 +170,8 @@
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
<AdditionalLibraryDirectories>$(ProjectDir)dep\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>nf.res;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Game/src/Game.cpp
+2 -4
View File
@@ -1,11 +1,9 @@
#include "NothinFancy.h"
#include "MainState.h"
using namespace nf;
int main(int argc, char* argv[]) {
Config conf = { 1280, 720, false, "Example Game"};
Application app(conf);
nf::Config conf = { 1280, 720, false, "Example Game"};
nf::Application app(conf);
//app.setWindowIcon(...);
// app.setWindowCursor(...);
Game/src/MainState.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "MainState.h"
MainState::MainState(Application* app) :
MainState::MainState(nf::Application* app) :
Gamestate(app)
{
}
@@ -13,7 +13,7 @@ void MainState::update(double deltaTime) {
}
void MainState::render() {
static Renderer& renderer = *m_app->getRenderer();
static nf::Renderer& renderer = *m_app->getRenderer();
}
void MainState::onExit() {
Game/src/include/MainState.h
+1 -1
View File
@@ -3,7 +3,7 @@
class MainState : public nf::Gamestate {
public:
MainState(Application* app);
MainState(nf::Application* app);
void onEnter() override;