GoaLitiuM/GoakeFlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
GoaLitiuM
2021-12-30 16:30:16 +02:00
parent cccbf334aa
commit 99637255da
22 changed files with 4950 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -19,3 +19,4 @@ Source/obj/
*.DotSettings.user
Tests/bin/
Tests/obj/
Assets/desktop.ini

BIN
Assets/Audio/465299__mypantsfelldown__concrete-footsteps.flac Normal file
View File

Binary file not shown.

BIN
Assets/Audio/jumpland1.wav Normal file
View File

Binary file not shown.

BIN
Assets/Audio/jumpland1_22.wav Normal file
View File

Binary file not shown.

BIN
Assets/Audio/jumpland2.wav Normal file
View File

Binary file not shown.

BIN
Assets/Audio/jumpland3.wav Normal file
View File

Binary file not shown.

4858
Assets/Maps/aerowalk.map Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Content/Audio/jumpland1.flax Normal file
View File

Binary file not shown.

BIN
Content/Audio/jumpland1_22.flax Normal file
View File

Binary file not shown.

BIN
Content/Audio/jumpland2.flax Normal file
View File

Binary file not shown.

BIN
Content/Audio/jumpland3.flax Normal file
View File

Binary file not shown.

6
Content/Common/PlayerPrefab.prefab
View File

@@ -1,7 +1,7 @@
{
"ID": "2d0e518b47d735c98312dd87cc42d6d7",
"TypeName": "FlaxEngine.Prefab",
"EngineBuild": 6225,
"EngineBuild": 6226,
"Data": [
{
"ID": "999a202c47de967d2bdfd09abcc6df4e",
@@ -34,7 +34,9 @@
"TypeName": "Game.PlayerMovement",
"ParentID": "999a202c47de967d2bdfd09abcc6df4e",
"V": {
"JumpLandSound": "a9ae0bbf438b4e841277f39c3d7c7c8b"
"JumpLandSound": "bb00d24d4b651f5d5b44f09c022c83ac",
"JumpLandSound2": "d3598b01434cf7ace99acfb27e08cbe5",
"JumpLandSound3": "5869f22d4f8396e06b0cf7a3b70fb5d2"
}
},
{

22
Content/Scenes/AerowalkScene.scene
View File

@@ -21,7 +21,9 @@
"ID": "c95a3dab492c1b2046ce2191daa2b111",
"TypeName": "Game.Q3MapImporter",
"ParentID": "194e05f445ece24ec5448d886e1334df",
"V": {}
"V": {
"mapPath": "C:\\dev\\GoakeFlax\\Assets\\Maps\\aerowalk.map"
}
},
{
"ID": "ff6b6db54b5aa08e7286ef86246149ef",
@@ -68,13 +70,13 @@
"Transform": {
"Translation": {
"X": 0.0,
"Y": 254.0,
"Y": 226.0,
"Z": 0.0
}
},
"Control": "FlaxEngine.GUI.Label",
"Data": {
"Text": "eFPS: 15\nuFPS: 15\nrFPS: 15\npFPS: 30\nCon: NaNms\nDirectX11\nGC memory: 12.47396MB",
"Text": "eFPS: 61\nuFPS: 60\nrFPS: 60\npFPS: 30\nCon: NaNms\nDirectX11",
"TextColor": {
"R": 1.0,
"G": 1.0,
@@ -121,9 +123,9 @@
},
"Offsets": {
"Left": 0.0,
"Right": 143.0,
"Right": 71.0,
"Top": -562.0,
"Bottom": 112.0
"Bottom": 96.0
},
"Scale": {
"X": 1.0,
@@ -145,7 +147,8 @@
"A": 0.0
},
"Enabled": true,
"Visible": true
"Visible": true,
"AutoFocus": false
}
},
{
@@ -161,8 +164,8 @@
"Name": "ContainerControl 0",
"Transform": {
"Translation": {
"X": 45644.0,
"Y": 2.0,
"X": 45849.0,
"Y": -12.0,
"Z": 0.0
}
},
@@ -204,7 +207,8 @@
"A": 0.0
},
"Enabled": true,
"Visible": true
"Visible": true,
"AutoFocus": true
}
},
{

18
Content/Scenes/MainScene.scene
View File

@@ -1,7 +1,7 @@
{
"ID": "0733cc9b40d3d05366be64bbd9b59e21",
"TypeName": "FlaxEngine.SceneAsset",
"EngineBuild": 6224,
"EngineBuild": 6226,
"Data": [
{
"ID": "0733cc9b40d3d05366be64bbd9b59e21",
@@ -35,9 +35,7 @@
"PrefabID": "2d0e518b47d735c98312dd87cc42d6d7",
"PrefabObjectID": "b29a58f545071ca393afaab21faa83ad",
"ParentID": "d9110dd14d9950a23388b894f38cfb87",
"V": {
"JumpLandSound": "a9ae0bbf438b4e841277f39c3d7c7c8b"
}
"V": {}
},
{
"ID": "5c30e8d943f94a215a567bb44cc56c3b",
@@ -112,13 +110,13 @@
"Transform": {
"Translation": {
"X": 0.0,
"Y": 735.0,
"Y": 708.0,
"Z": 0.0
}
},
"Control": "FlaxEngine.GUI.Label",
"Data": {
"Text": "eFPS: 121\nuFPS: 120\nrFPS: 120\npFPS: 30\nCon: NaNms\nDirectX11\nGC memory: 8.089344MB",
"Text": "eFPS: 61\nuFPS: 60\nrFPS: 60\npFPS: 30\nCon: NaNms\nDirectX11",
"TextColor": {
"R": 1.0,
"G": 1.0,
@@ -165,9 +163,9 @@
},
"Offsets": {
"Left": 0.0,
"Right": 143.0,
"Right": 71.0,
"Top": -80.0,
"Bottom": 112.0
"Bottom": 96.0
},
"Scale": {
"X": 1.0,
@@ -205,8 +203,8 @@
"Name": "ContainerControl 0",
"Transform": {
"Translation": {
"X": 45644.0,
"Y": 1.5,
"X": 45849.0,
"Y": -12.0,
"Z": 0.0
}
},

36
Content/Scenes/MainSceneLit.scene
View File

@@ -1,18 +1,11 @@
{
"ID": "a0165b834429c74b9d547c88fb3a0de0",
"TypeName": "FlaxEngine.SceneAsset",
"EngineBuild": 6224,
"EngineBuild": 6226,
"Data": [
{
"ID": "a0165b834429c74b9d547c88fb3a0de0",
"TypeName": "FlaxEngine.Scene",
"Lightmaps": [
{
"Lightmap0": "9dc3fa5a4a85f2097d1042bece9c6bfc",
"Lightmap1": "c0382cdb4d4f771f7aa1e0b29d235754",
"Lightmap2": "0e23c326452369bc0cb53d8531daa0be"
}
],
"LightmapSettings": {
"IndirectLightingIntensity": 3.0,
"GlobalObjectsScale": 1.0,
@@ -28,7 +21,20 @@
"ID": "f17c6b3346a31cdc5478efa795107612",
"PrefabID": "2d0e518b47d735c98312dd87cc42d6d7",
"PrefabObjectID": "999a202c47de967d2bdfd09abcc6df4e",
"ParentID": "a0165b834429c74b9d547c88fb3a0de0"
"ParentID": "a0165b834429c74b9d547c88fb3a0de0",
"Transform": {
"Translation": {
"X": -114.15983581542969,
"Y": 5.256906509399414,
"Z": -32.30524444580078
},
"Orientation": {
"X": 0.0,
"Y": 1.4901159417490817e-8,
"Z": 0.0,
"W": -1.0
}
}
},
{
"ID": "3cabff454d2e5cedc7b7f888960e1a30",
@@ -118,13 +124,13 @@
"Transform": {
"Translation": {
"X": 0.0,
"Y": 735.0,
"Y": 708.0,
"Z": 0.0
}
},
"Control": "FlaxEngine.GUI.Label",
"Data": {
"Text": "eFPS: 238\nuFPS: 238\nrFPS: 238\npFPS: 30\nCon: NaNms\nDirectX11\nGC memory: 13.95565MB",
"Text": "eFPS: 60\nuFPS: 5\nrFPS: 60\npFPS: 29\nCon: NaNms\nDirectX11",
"TextColor": {
"R": 1.0,
"G": 1.0,
@@ -171,9 +177,9 @@
},
"Offsets": {
"Left": 0.0,
"Right": 143.0,
"Right": 71.0,
"Top": -80.0,
"Bottom": 112.0
"Bottom": 96.0
},
"Scale": {
"X": 1.0,
@@ -211,8 +217,8 @@
"Name": "ContainerControl 0",
"Transform": {
"Translation": {
"X": 44550.0,
"Y": 1.5,
"X": 45849.0,
"Y": -12.0,
"Z": 0.0
}
},

2
Content/Settings/EngineSettings/PhysicsSettings.json
View File

@@ -1,7 +1,7 @@
{
"ID": "4bd8a4cc460399b5f1975fbe0a668e3f",
"TypeName": "FlaxEditor.Content.Settings.PhysicsSettings",
"EngineBuild": 6219,
"EngineBuild": 6226,
"Data": {
"DefaultGravity": {
"X": 0.0,

6
Content/Settings/EngineSettings/WindowsPlatformSettings.json
View File

@@ -9,10 +9,10 @@
"ResizableWindow": true,
"RunInBackground": true,
"ForceSingleInstance": false,
"OverrideIcon": "00000000-0000-0000-0000-000000000000",
"SupportDX12": false,
"OverrideIcon": null,
"SupportDX12": true,
"SupportDX11": true,
"SupportDX10": false,
"SupportVulkan": false
"SupportVulkan": true
}
}

2
Source/Game/Cabrito/FpsScript.cs
View File

@@ -90,7 +90,7 @@ namespace Cabrito
sb.Append("\npFPS: " + ((int) Math.Round(1.0f / physicsTimeAvg)).ToString());
sb.Append("\nCon: " + conTime.ToString() + "ms");
sb.Append("\n" + currentRenderer);
sb.Append("\nGC memory: " + (GC.GetTotalMemory(false) / 1000000.0f).ToString() + "MB");
//sb.Append("\nGC memory: " + (GC.GetTotalMemory(false) / 1000000.0f).ToString() + "MB");
//sb.Append("\nUpdate profiler: " + updateProfTime.ToString() + "ms");
#if false

1
Source/Game/PlayerInputDemo.cs
View File

@@ -16,7 +16,6 @@ namespace Game
public PlayerInputDemo(string demoPath)
{
Console.Print("demo?");
if (!File.Exists(demoPath))
return;

32
Source/Game/PlayerMovement.cs
View File

@@ -33,6 +33,10 @@ namespace Game
public float MoveSpeed { get; set; } = 320;
public AudioClip JumpLandSound;
public AudioClip JumpLandSound2;
public AudioClip JumpLandSound3;
private AudioClip lastJumpLandSound;
private Random soundRandom;
private float viewPitch;
private float viewYaw;
@@ -52,8 +56,8 @@ namespace Game
{
base.OnAwake();
//input = new PlayerInputLocal(@"C:\dev\GoakeFlax\testdemo.gdem");
input = new PlayerInputDemo(@"C:\dev\GoakeFlax\testdemo.gdem");
input = new PlayerInputLocal(@"C:\dev\GoakeFlax\testdemo.gdem"); // record
//input = new PlayerInputDemo(@"C:\dev\GoakeFlax\testdemo.gdem"); //playback
onExit.Triggered += () =>
{
@@ -64,6 +68,8 @@ namespace Game
rootActor = Actor.GetChild(0);
rigidBody = Actor.As<RigidBody>();
soundRandom = new Random();
//rigidBody.CollisionEnter += OnCollisionEnter;
//rigidBody.TriggerEnter += OnTriggerEnter;
//rigidBody.TriggerExit += OnTriggerExit;
@@ -776,16 +782,32 @@ namespace Game
jumped = true;
lastJumped = Time.GameTime;
if (JumpLandSound != null && JumpLandSound.IsLoaded)
var jumpLandSound = JumpLandSound;
for (int i = 0; i < 10; i++)
{
var r = soundRandom.Next(3);
if (r == 1)
jumpLandSound = JumpLandSound2;
else if (r == 2)
jumpLandSound = JumpLandSound3;
// avoid repetition
if (jumpLandSound != lastJumpLandSound)
break;
}
if (jumpLandSound != null && jumpLandSound.IsLoaded)
{
var audioSource = new AudioSource();
audioSource.Clip = JumpLandSound;
audioSource.Clip = jumpLandSound;
audioSource.Position = rootActor.Position; //new Vector3(-350, 176, 61);//rootActor.Position;
audioSource.Parent = Actor.Parent;
audioSource.Pitch = 1f;
audioSource.Name = jumpLandSound.Path;
audioSource.Play();
Destroy(audioSource, JumpLandSound.Length);
Destroy(audioSource, jumpLandSound.Length);
lastJumpLandSound = jumpLandSound;
}
}

5
asset_sources.txt Normal file
View File

@@ -0,0 +1,5 @@
footsteps: https://freesound.org/people/mypantsfelldown/sounds/465299/
first step +10 bass and +7 treble, second step untouched
fadeout reverb on both steps

8
eastereggs.txt Normal file
View File

@@ -0,0 +1,8 @@
- death screen texts?
- you died (dark souls style)
- "mortis" (faith: the unholy trinity)
- game over (metal gear solid)
- your deeds of valor will be remembered (diablo)
- wasted (GTA)
- doom-style camera fall when dead
-