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

Moved to MSVC v143, moved headers into a folder, and added texts to the example

Browse Source
This commit is contained in:
grayson committed 2021-11-30 01:10:28 -06:00
1 parent 3b5b608ae9
commit 9101000b97
98 files changed
+190041 -190857
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/Game.vcxproj
+2 -2
View File
@@ -21,13 +21,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Game/assets/example/models/env.mtl
+4 -4
View File
@@ -1,13 +1,13 @@
# Blender MTL File: 'None'
# Material Count: 1
newmtl grass
Ns 225.000000
newmtl mat
Ns 100.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.000000 0.000000 0.000000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 1
illum 2
map_Kd grass.jpg
Game/assets/example/models/env.obj
+189719 -190495
View File
File diff suppressed because it is too large. Load diff
Game/assets/example/models/normal.mtl
-14
View File
@@ -1,14 +0,0 @@
# Blender MTL File: 'None'
# Material Count: 1
newmtl mat
Ns 100.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
map_Bump brickwall_normal.jpg
map_Kd brickwall.jpg
Game/assets/example/models/normal.obj
-17
View File
@@ -1,17 +0,0 @@
# Blender v2.93.3 OBJ File: ''
# www.blender.org
mtllib normal.mtl
o Plane_Plane.001
v -1.000000 -1.000000 -0.000000
v 1.000000 -1.000000 -0.000000
v -1.000000 1.000000 0.000000
v 1.000000 1.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 0.000000 0.000000
vt 1.000000 1.000000
vn 0.0000 -0.0000 1.0000
usemtl mat
s off
f 2/1/1 3/2/1 1/3/1
f 2/1/1 4/4/1 3/2/1
Game/assets/example/models/spec.mtl
-14
View File
@@ -1,14 +0,0 @@
# Blender MTL File: 'None'
# Material Count: 1
newmtl Material.001
Ns 750.283502
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
map_Kd diff.png
map_Ks spec.png
Game/assets/example/models/spec.obj
-46
View File
@@ -1,46 +0,0 @@
# Blender v2.93.3 OBJ File: ''
# www.blender.org
mtllib spec.mtl
o Cube_Cube.001
v -1.000000 -1.000000 1.000000
v -1.000000 1.000000 1.000000
v -1.000000 -1.000000 -1.000000
v -1.000000 1.000000 -1.000000
v 1.000000 -1.000000 1.000000
v 1.000000 1.000000 1.000000
v 1.000000 -1.000000 -1.000000
v 1.000000 1.000000 -1.000000
vt -2.000000 -1.000000
vt -1.000000 0.000000
vt -2.000000 0.000000
vt -1.000000 -1.000000
vt 0.000000 0.000000
vt 0.000000 -1.000000
vt 1.000000 0.000000
vt 1.000000 -1.000000
vt 2.000000 -0.000000
vt 1.000000 1.000000
vt 0.000000 1.000000
vt 0.000000 -2.000000
vt 2.000000 -1.000000
vt 1.000000 -2.000000
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl Material.001
s off
f 2/1/1 3/2/1 1/3/1
f 4/4/2 7/5/2 3/2/2
f 8/6/3 5/7/3 7/5/3
f 6/8/4 1/9/4 5/7/4
f 7/5/5 1/10/5 3/11/5
f 4/12/6 6/8/6 8/6/6
f 2/1/1 4/4/1 3/2/1
f 4/4/2 8/6/2 7/5/2
f 8/6/3 6/8/3 5/7/3
f 6/8/4 2/13/4 1/9/4
f 7/5/5 5/7/5 1/10/5
f 4/12/6 2/14/6 6/8/6
Game/assets/example/textures/cube.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

Game/assets/example/textures/grass.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 329 KiB

Game/src/MainState.cpp
+31 -11
View File
@@ -5,22 +5,33 @@ void MainState::onEnter() {
currCamType = nf::Camera::Type::FIRST_PERSON;
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);
plane.setScale(20.0);
plane.setPosition(0.0, -20.0, 0.0);
text.create("", nf::Vec2(0.1, 0.025), nf::Vec3(0.8));
text.centered(true);
gravText.create("", nf::Vec2(0.025, 0.2), nf::Vec3(0.8), 1.0f, 0.5f);
uiTex.create(nf::BaseAssets::logo, nf::Vec2(0.025, 0.025), 0.5);
button.create(nf::Vec2(0.8, 0.025), "Reset");
button2.create(nf::Vec2(0.6, 0.025), "Play Sound");
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));
light3.create(nf::Vec3(10.0, 20.0, 10.0), nf::Vec3(1.0, 1.0, 1.0));
cm.create(nf::BaseAssets::cubemap);
text.create("", nf::Vec2(0.1, 0.025), nf::Vec3(0.8));
text.centered(true);
moveText.create("WASD - move", nf::Vec2(0.025, 0.8), nf::Vec3(0.8), 0.5f);
lookText.create("Mouse - look", nf::Vec2(0.025, 0.75), nf::Vec3(0.8), 0.5f);
leftClickText.create("Left Click - Shoot single sphere", nf::Vec2(0.025, 0.7), nf::Vec3(0.8), 0.5f);
rightClickText.create("Right Click - Shoot many spheres", nf::Vec2(0.025, 0.65), nf::Vec3(0.8), 0.5f);
upAndDownText.create("Up and Down - Change the gravity", nf::Vec2(0.025, 0.6), nf::Vec3(0.8), 0.5f);
leftAndRightText.create("Left and Right - Change the default ambient light", nf::Vec2(0.025, 0.55), nf::Vec3(0.8), 0.5f);
escText.create("ESC - Quit", nf::Vec2(0.025, 0.5), nf::Vec3(0.8), 0.5f);
currGravText.create("", nf::Vec2(0.025, 0.25), nf::Vec3(0.8), 0.5f);
currLightText.create("", nf::Vec2(0.025, 0.2), nf::Vec3(0.8), 0.5f);
uiTex.create(nf::BaseAssets::logo, nf::Vec2(0.025, 0.025), 0.5);
button.create(nf::Vec2(0.8, 0.025), "Reset");
button2.create(nf::Vec2(0.6, 0.025), "Play Sound");
sound.create(ap.get("sound.wav"));
sound.setEntity(test);
sound2.create(ap.get("test.ogg"));
@@ -31,7 +42,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::cone, nf::Entity::Type::DYNAMIC);
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));
}
}
@@ -40,9 +51,9 @@ void MainState::onEnter() {
grav = 2.0f;
setGravity(grav);
amb = 0.1f;
amb = 0.5f;
camera->setPosition(-20.0, 15.0, 0.0);
camera->setPosition(-20.0, 7.0, 0.0);
camera->setRotation(85.0, -30.0);
}
@@ -104,7 +115,7 @@ void MainState::update(float deltaTime) {
grav = 2.0f;
setGravity(1.0f);
}
gravText.setText("Gravity Scale: " + std::to_string(grav));
currGravText.setText("Gravity Scale: " + std::to_string(grav));
if (app->isKeyHeld(NFI_LEFT))
amb -= 0.01f;
@@ -112,6 +123,7 @@ void MainState::update(float deltaTime) {
amb += 0.01f;
if (amb >= 0.0f)
setAmbientLight(amb);
currLightText.setText("Ambient Light Multiplier: " + std::to_string(amb));
if (app->isKeyPressed(NFI_ESCAPE))
app->quit();
@@ -124,7 +136,15 @@ void MainState::render(nf::Renderer& renderer) {
renderer.render(light2);
renderer.render(light3);
renderer.render(text);
renderer.render(gravText);
renderer.render(moveText);
renderer.render(lookText);
renderer.render(leftClickText);
renderer.render(rightClickText);
renderer.render(upAndDownText);
renderer.render(currGravText);
renderer.render(leftAndRightText);
renderer.render(currLightText);
renderer.render(escText);
renderer.render(uiTex);
renderer.render(button);
renderer.render(button2);
Game/src/include/MainState.h
+9 -1
View File
@@ -16,7 +16,15 @@ private:
nf::Entity test;
nf::Entity plane;
nf::Text text;
nf::Text gravText;
nf::Text moveText;
nf::Text lookText;
nf::Text leftClickText;
nf::Text rightClickText;
nf::Text upAndDownText;
nf::Text currGravText;
nf::Text leftAndRightText;
nf::Text currLightText;
nf::Text escText;
nf::UITexture uiTex;
nf::Button button;
nf::Button button2;