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

precleanup

Browse Source
This commit is contained in:
GoaLitiuM
2021-06-28 16:20:57 +03:00
parent 5d98b41c85
commit c7369d94b5
8 changed files with 24 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Materials/dev/dev_128_lit.flax
View File

Binary file not shown.

24
Content/Scenes/MainSceneLit.scene
View File

@@ -1,16 +1,16 @@
{
"ID": "a0165b834429c74b9d547c88fb3a0de0",
"TypeName": "FlaxEngine.SceneAsset",
"EngineBuild": 6219,
"EngineBuild": 6220,
"Data": [
{
"ID": "a0165b834429c74b9d547c88fb3a0de0",
"TypeName": "FlaxEngine.Scene",
"Lightmaps": [
{
"Lightmap0": "00000000000000000000000000000000",
"Lightmap1": "00000000000000000000000000000000",
"Lightmap2": "00000000000000000000000000000000"
"Lightmap0": "9dc3fa5a4a85f2097d1042bece9c6bfc",
"Lightmap1": "c0382cdb4d4f771f7aa1e0b29d235754",
"Lightmap2": "0e23c326452369bc0cb53d8531daa0be"
}
],
"LightmapSettings": {
@@ -168,13 +168,13 @@
"Transform": {
"Translation": {
"X": 0.0,
"Y": 734.0,
"Y": 733.0,
"Z": 0.0
}
},
"Control": "FlaxEngine.GUI.Label",
"Data": {
"Text": "uFPS: 333\nrFPS: 333\npFPS: 30\nCon: NaNms\nDirectX11\nGC memory: 16.1349MB",
"Text": "eFPS: 16\nuFPS: 15\nrFPS: 15\npFPS: 30\nCon: NaNms\nDirectX11\nGC memory: 8.130952MB",
"TextColor": {
"R": 1.0,
"G": 1.0,
@@ -220,9 +220,9 @@
},
"Offsets": {
"Left": 0.0,
"Right": 136.0,
"Right": 143.0,
"Top": -80.0,
"Bottom": 96.0
"Bottom": 112.0
},
"Scale": {
"X": 1.0,
@@ -260,8 +260,8 @@
"Name": "ContainerControl 0",
"Transform": {
"Translation": {
"X": 45676.0,
"Y": 1.0,
"X": 45644.0,
"Y": 0.5,
"Z": 0.0
}
},
@@ -373,8 +373,8 @@
"LightmapIndex": 0,
"LightmapArea": {
"Location": {
"X": 0.0068359375,
"Y": 0.0068359375
"X": 0.0029296875,
"Y": 0.0029296875
},
"Size": {
"X": 0.6962890625,

4
Content/Settings/TimeSettings.json
View File

@@ -1,9 +1,9 @@
{
"ID": "a55dc3c04da4ea3744b7f1994565beac",
"TypeName": "FlaxEditor.Content.Settings.TimeSettings",
"EngineBuild": 6219,
"EngineBuild": 6220,
"Data": {
"UpdateFPS": 0.0,
"UpdateFPS": 60.0,
"PhysicsFPS": 60.0,
"DrawFPS": 0.0,
"TimeScale": 1.0,

11
Plugins/Cabrito/.gitignore vendored
View File

@@ -1,11 +0,0 @@
Cabrito.sln
Binaries/*
Cache/*
Logs/*
packages/*
Source/**/*.csproj
Source/**/*.Gen.cs
*.csproj.user
*.suo

26
Plugins/Cabrito/Cabrito.flaxproj
View File

@@ -1,26 +0,0 @@
{
"Name": "Cabrito",
"Version": "1.0",
"Company": "My Company",
"Copyright": "",
"GameTarget": "CabritoTarget",
"EditorTarget": "CabritoEditorTarget",
"References": [
{
"Name": "$(EnginePath)/Flax.flaxproj"
}
],
"DefaultSceneSpawn": {
"Position": {
"X": 0.0,
"Y": 0.0,
"Z": 0.0
},
"Direction": {
"X": 0.0,
"Y": 0.0,
"Z": 1.0
}
},
"MinEngineVersion": "0.0.6194"
}

BIN
Plugins/Cabrito/Source/CabritoEditorTarget.Build.cs
View File

Binary file not shown.

13
Plugins/Cabrito/Source/CabritoTarget.Build.cs
View File

@@ -1,13 +0,0 @@
using Flax.Build;
public class CabritoTarget : GameProjectTarget
{
/// <inheritdoc />
public override void Init()
{
base.Init();
// Reference the modules for game
Modules.Add("Cabrito");
}
}

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

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
using FlaxEditor.Content.Settings;
using FlaxEngine;
using FlaxEngine.GUI;
@@ -78,13 +79,16 @@ namespace Cabrito
ConsoleContentTextBox.accumDrawTimes = 0;
}
((Label)control.Control).Text = "uFPS: " + ((int)Math.Round(1.0f / updateTimeAvg)).ToString();
label.Text += "\nrFPS: " + ((int)Math.Round(1.0f / drawTimeAvg)).ToString();
label.Text += "\npFPS: " + ((int)Math.Round(1.0f / physicsTimeAvg)).ToString();
label.Text += "\nCon: " + conTime.ToString() + "ms";
label.Text += "\n" + currentRenderer;
label.Text += "\nGC memory: " + (GC.GetTotalMemory(false)/1000000.0f).ToString() + "MB";
StringBuilder sb = new StringBuilder();
sb.Append("eFPS: " + Engine.FramesPerSecond);
sb.Append("\nuFPS: " + ((int)Math.Round(1.0f / updateTimeAvg)).ToString());
sb.Append("\nrFPS: " + ((int)Math.Round(1.0f / drawTimeAvg)).ToString());
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");
((Label) control.Control).Text = sb.ToString();
/*if (!Platform.HasFocus)
{
Time.UpdateFPS = 15;