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

Improved logger, added a debug timer, other small stuff, and wrote more user guide

Browse Source
This commit is contained in:
grayson committed 2021-12-04 02:17:33 -06:00
1 parent f66c3fb4e0
commit 21764d3f98
25 files changed
+326 -121
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/Game.vcxproj
+2
View File
@@ -61,6 +61,7 @@
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)src\include\;$(SolutionDir)NothinFancy\src\include\</AdditionalIncludeDirectories>
<ObjectFileName>$(IntDir)obj\</ObjectFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -90,6 +91,7 @@ if exist "base.nfpack" (copy "base.nfpack" "$(OutDir)assets\")</Command>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)src\include\;$(SolutionDir)NothinFancy\src\include\</AdditionalIncludeDirectories>
<ObjectFileName>$(IntDir)obj\</ObjectFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Game/src/Game.cpp
+2
View File
@@ -16,6 +16,8 @@ int main(int argc, char* argv[]) {
app.setDefaultState("Main State");
app.run();
delete test;
}
return 0;
Game/src/MainState.cpp
+6 -9
View File
@@ -6,11 +6,9 @@ void MainState::onEnter() {
camera->setType(currCamType);
ap.load("example.nfpack");
test.create(ap.get("2mats.obj"), nf::Entity::Type::DYNAMIC);
test.setPosition(nf::Vec3(0.0, 1.5, -5.0));
plane.create(ap.get("env.obj"), nf::Entity::Type::MAP);
test.create(ap.get("2mats.obj"), nf::Vec3(0.0, 1.5, -5.0), nf::Entity::Type::DYNAMIC);
plane.create(ap.get("env.obj"), nf::Vec3(0.0, -20.0, 0.0), nf::Entity::Type::MAP);
plane.setScale(20.0);
plane.setPosition(0.0, -20.0, 0.0);
light.create(nf::Vec3(0.0, 20.0, 0.0), nf::Vec3(1.0, 1.0, 1.0));
light2.create(nf::Vec3(-10.0, 20.0, -10.0), nf::Vec3(1.0, 1.0, 1.0));
@@ -42,8 +40,7 @@ void MainState::onEnter() {
for (int y = 0; y < 3; y++) {
for (int z = 0; z < 3; z++) {
entities.push_back(new nf::Entity);
entities.back()->create(nf::BaseAssets::cube, nf::Entity::Type::DYNAMIC);
entities.back()->setPosition(nf::Vec3(5.0 + x * 2.05, 1.0 + y * 2.05, -5.0 + z * 2.05));
entities.back()->create(nf::BaseAssets::cube, nf::Vec3(5.0 + x * 2.05, 1.0 + y * 2.05, -5.0 + z * 2.05), nf::Entity::Type::DYNAMIC);
}
}
}
@@ -51,7 +48,8 @@ void MainState::onEnter() {
grav = 2.0f;
setGravity(grav);
amb = 0.5f;
amb = 0.1f;
setAmbientLight(amb);
camera->setPosition(-20.0, 7.0, 0.0);
camera->setRotation(85.0, -30.0);
@@ -97,8 +95,7 @@ void MainState::update(float deltaTime) {
if (camera->getType() == nf::Camera::Type::FIRST_PERSON && (app->isMouseClicked(NFI_LEFTMOUSE) || app->isMouseHeld(NFI_RIGHTMOUSE))) {
entities.push_back(new nf::Entity);
entities.back()->create(nf::BaseAssets::sphere, nf::Entity::Type::DYNAMIC);
entities.back()->setPosition(camera->getPosition() + camera->getRotation() * 5.0);
entities.back()->create(nf::BaseAssets::sphere, camera->getPosition() + camera->getRotation() * 5.0, nf::Entity::Type::DYNAMIC);
entities.back()->setVelocity(camera->getRotation() * 100.0f);
entities.back()->setMass(1000.0f);
}