Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
bd16d7c
Removed submodule
Aug 3, 2020
b87b8ed
Removed submodule *again
Aug 3, 2020
562c8fc
ImGui should be working
Aug 5, 2020
afba6c5
Removed ImGui submodule
Aug 8, 2020
473cf0e
Removed ImGui Testilb
Aug 8, 2020
255aa02
Added ImGui as submodule
Aug 8, 2020
1c30053
Code refactoring
Aug 8, 2020
19b9226
Submodule fix Step 1
Aug 8, 2020
00ab35c
Merged master
Aug 9, 2020
83d3c0f
Basic GUI and ConsoleWindow
Aug 16, 2020
ea0ed2f
Inspector almost done
Aug 22, 2020
e07e7c5
Merge pull request #1 from RogueMacro/BasicEditorGUI
RogueMacro Aug 22, 2020
530ad1a
Editor now saves settings (Style + Open windows)
Aug 22, 2020
5debceb
Removed submodules
Aug 22, 2020
aae42a9
Removed additional non-submodule libraries
Aug 22, 2020
9f217e9
Add GLFW as submodule + Fixed style number parsing bug
Aug 22, 2020
f3689f7
Merged Steel master
Aug 22, 2020
5b32d9b
GameConsole implementation
Fusioon Aug 13, 2020
ca09384
Merged GameConsole
Aug 23, 2020
9d945c8
GameConsole changes + Fixed ConsoleWindow + Removed column separator
Aug 23, 2020
0a35ee6
Fixed EditorGUI.InputText to keep existing buffer
Aug 23, 2020
1d85b5b
Added HierarchyWindow
Aug 23, 2020
cbbf1c4
Inspector now supports addition of components
Aug 23, 2020
17bf224
Merge branch 'master' into BasicEditorGui
RogueMacro Aug 24, 2020
68d52a2
Fixed merge error again
Aug 25, 2020
218286c
Fixed LayerStack
Aug 25, 2020
103cdf2
Project serialization stuff
Sep 3, 2020
46fd4b6
Added New Project functionality
Sep 4, 2020
cef484e
Content window
Sep 14, 2020
18ff6fc
Inspector File View + Docking
Oct 7, 2020
30b449a
Removed ImGui
Oct 7, 2020
4144c1b
Removed again
Oct 7, 2020
f572fe2
Added ImGui
Oct 7, 2020
5327ea0
Fixed Debug window showing in Editor
Oct 7, 2020
3c80fab
File View in Inspector
Oct 19, 2020
89363b1
Fixed Pop/Remove Layer Memory leak
Oct 26, 2020
f028204
Inspector Add Component rework
Oct 26, 2020
baba236
Hierarchy features
Oct 26, 2020
d211e2c
Moved usable util methods from Editor to Engine
Oct 26, 2020
1182f56
Code refactoring
Oct 26, 2020
2fb4895
More refactoring
Oct 26, 2020
3e0daf1
Fixed SerializableEntity memory leak when saving
Oct 26, 2020
9a1483d
Fixed crash when cache is empty
Oct 26, 2020
55ec359
Removed open windows from cache (Not needed with docking enabled)
Oct 26, 2020
949942d
Switched from Open Folder to Open File when opening project
Oct 26, 2020
f2049c6
Fixed Recent project showing file instead of folder
Oct 26, 2020
59586d6
Fixed bug when opening recent/new project
Oct 26, 2020
6626fdc
Inspector can now show ints, floats and strings
Oct 26, 2020
ef5acc9
Fixed properties in inspector not resizing with column
Oct 26, 2020
cd03e29
LayerStack better memory management
Oct 27, 2020
90a96bb
LayerStack memory management improvements
Oct 27, 2020
8bead2f
Added MsgPack
Oct 28, 2020
a994f6d
Fixed open windows cache bug
Oct 29, 2020
5ad6ab1
Some stuff
Dec 11, 2020
3ad28c7
Improved serialization
RogueMacro Dec 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Directories
build/
recovery/

# Files
BeefSpace_User.toml
BeefSpace_User.toml
Editor/imgui.ini
20 changes: 14 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
[submodule "Libs/ImGui"]
path = Libs/ImGui
url = https://github.com/Beef-Community-Project/imgui-beef
branch = docking
[submodule "Libs/GLFW"]
[submodule "GLFW"]
path = Libs/GLFW
url = https://github.com/MineGame159/glfw-beef.git
url = https://github.com/MineGame159/glfw-beef
[submodule "BGFX"]
path = Libs/BGFX
url = https://github.com/ExoKomodo/Bgfx-bf
[submodule "JSON_Beef"]
path = Libs/JSON_Beef
url = https://github.com/Jonathan-Racaud/JSON_Beef
[submodule "Beef-Extensions-Lib"]
path = Libs/Beef-Extensions-Lib
url = https://github.com/Jonathan-Racaud/Beef-Extensions-Lib
[submodule "ImGui"]
path = Libs/ImGui
url = https://github.com/RogueMacro/imgui-beef
[submodule "MsgPack"]
path = Libs/MsgPack
url = https://github.com/NicEastvillage/MsgPackBf
11 changes: 6 additions & 5 deletions BeefSpace.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FileVersion = 1
Projects = {SteelEngine = {Path = "Engine"}, SteelEditor = {Path = "Editor"}, glfw-beef = {Path = "Libs/GLFW"}, BasicSteelGame = {Path = "Examples/BasicSteelGame"}}

[Workspace]
StartupProject = "BasicSteelGame"
FileVersion = 1
Projects = {SteelEngine = {Path = "Engine"}, SteelEditor = {Path = "Editor"}, BeefExtensionsLib = {Path = "Libs/Beef-Extensions-Lib"}, JSON_Beef = {Path = "Libs/JSON_Beef/lib"}, ImGuiImplGlfw = {Path = "Libs/ImGui/ImGuiImplGlfw"}, ImGuiImplOpenGL3 = {Path = "Libs/ImGui/ImGuiImplOpenGL3"}, glfw-beef = {Path = "Libs/GLFW"}, ImGui = {Path = "Libs/ImGui/ImGui"}, MsgPackBf = {Path = "Libs/MsgPack/lib"}}
Locked = ["BeefExtensionsLib", "JSON_Beef", "ImGuiImplGlfw", "ImGuiImplOpenGL3", "glfw-beef", "ImGui", "MsgPackBf"]

[Workspace]
StartupProject = "SteelEditor"
6 changes: 5 additions & 1 deletion Editor/BeefProj.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
FileVersion = 1
Dependencies = {corlib = "*", glfw-beef = "*", SteelEngine = "*"}
Dependencies = {corlib = "*", SteelEngine = "*", BeefExtensionsLib = "*", ImGuiImplGlfw = "*", ImGuiImplOpenGL3 = "*", ImGui = "*", MsgPackBf = "*", JSON_Beef = "*"}

[Project]
Name = "SteelEditor"
StartupObject = "SteelEditor.Program"

[Configs.Debug.Win64]
BeefLibType = "DynamicDebug"
DebugWorkingDirectory = "$(ProjectDir)\\.."
5 changes: 5 additions & 0 deletions Editor/Samples/NewProject/BeefProj.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FileVersion = 1

[Project]
Name = "$(ProjectName)"
StartupObject = "$(ProjectName).Program"
5 changes: 5 additions & 0 deletions Editor/Samples/NewProject/BeefSpace.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FileVersion = 1
Projects = {$(ProjectName) = {Path = "."}, SteelEngine = {Path = "../../Engine"}, glfw-beef = {Path = "../../Libs/GLFW"}}

[Workspace]
StartupProject = "$(ProjectName)"
4 changes: 4 additions & 0 deletions Editor/Samples/NewProject/SteelProj.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Name": "$(ProjectName)",
"Entities": []
}
25 changes: 25 additions & 0 deletions Editor/Samples/NewProject/src/$(ProjectName).bf
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using SteelEngine;

namespace SteelEditor
{
public class $(ProjectName) : Application
{
// Gets called when the application is run
public override void OnInit()
{

}

// Gets called every frame
protected override void OnUpdate()
{

}

// Gets called when the application exits
public override void OnCleanup()
{

}
}
}
16 changes: 16 additions & 0 deletions Editor/Samples/NewProject/src/Program.bf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using System;

namespace $(ProjectName)
{
class Program
{
public static int Main(String[] args)
{
var app = new $(ProjectName);
app.Run();
delete app;

return 0;
}
}
}
35 changes: 35 additions & 0 deletions Editor/Themes/Default.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Alpha = 1
WindowPadding = [8, 8]
WindowRounding = 0
WindowBorderSize = 0
WindowMinSize = [32, 32]
WindowTitleAlign = [0, 0.5]
WindowMenuButtonPosition = None
ChildRounding = 0
ChildBorderSize = 1
PopupRounding = 0
PopupBorderSize = 0
FramePadding = [4, 3]
FrameRounding = 0
ItemSpacing = [8, 4]
ItemInnerSpacing = [4, 4]
TouchExtraPadding = [0, 0]
IndentSpacing = 21
ColumnsMinSpacing = 6
ScrollbarSize = 14
ScrollbarRounding = 0
GrabMinSize = 10
GrabRounding = 0
TabRounding = 0
TabBorderSize = 0
ColorButtonPosition = Right
ButtonTextAlign = [0.5, 0.5]
SelectableTextAlign = [0, 0]
DisplayWindowPadding = [19, 19]
DisplaySafeAreaPadding = [3, 3]
MouseCursorScale = 1
AntiAliasedLines = True
AntiAliasedFill = True
CurveTessellationTol = 1.25
CircleSegmentMaxError = 1.60000002
Colors = [[0.899999976, 0.899999976, 0.899999976, 1], [0.600000024, 0.600000024, 0.600000024, 1], [0.0705882385, 0.0823529437, 0.0980392173, 1], [0, 0, 0, 0], [0.109999999, 0.109999999, 0.140000001, 0.920000017], [0.5, 0.5, 0.5, 0.5], [0, 0, 0, 0], [0.430000007, 0.430000007, 0.430000007, 0.389999986], [0.469999999, 0.469999999, 0.689999998, 0.400000006], [0.419999987, 0.409999996, 0.639999986, 0.689999998], [0.132840857, 0.157223493, 0.18784529, 1], [0.109803922, 0.129411772, 0.152941182, 1], [0.400000006, 0.400000006, 0.800000012, 0.200000003], [0.124446772, 0.138211429, 0.149171293, 0.800000012], [0.200000003, 0.25, 0.300000012, 0.600000024], [0.400000006, 0.400000006, 0.800000012, 0.300000012], [0.400000006, 0.400000006, 0.800000012, 0.400000006], [0.409999996, 0.389999986, 0.800000012, 0.600000024], [0.899999976, 0.899999976, 0.899999976, 0.5], [1, 1, 1, 0.300000012], [0.409999996, 0.389999986, 0.800000012, 0.600000024], [0.196078435, 0.200000003, 0.203921571, 1], [0.300753921, 0.312140822, 0.325966835, 1], [0.392967284, 0.407308578, 0.453038692, 1], [0.400000006, 0.400000006, 0.899999976, 0.449999988], [0.449999988, 0.449999988, 0.899999976, 0.800000012], [0.529999971, 0.529999971, 0.870000005, 0.800000012], [0, 0, 0, 0], [0.600000024, 0.600000024, 0.699999988, 1], [0.699999988, 0.699999988, 0.899999976, 1], [1, 1, 1, 0.159999996], [0.779999971, 0.819999993, 1, 0.600000024], [0.779999971, 0.819999993, 1, 0.899999976], [0.176470593, 0.192156866, 0.20784314, 1], [0.449999988, 0.449999988, 0.899999976, 0.800000012], [0.270588249, 0.282352954, 0.298039228, 1], [0.176470593, 0.192156866, 0.20784314, 1], [0.270588249, 0.282352954, 0.298039228, 1], [0.400000006, 0.400000006, 0.899999976, 0.314999998], [0.200000003, 0.200000003, 0.200000003, 1], [1, 1, 1, 1], [0.899999976, 0.699999988, 0, 1], [0.899999976, 0.699999988, 0, 1], [1, 0.600000024, 0, 1], [0, 0, 1, 0.349999994], [1, 1, 0, 0.899999976], [0.449999988, 0.449999988, 0.899999976, 0.800000012], [1, 1, 1, 0.699999988], [0.800000012, 0.800000012, 0.800000012, 0.200000003], [0.200000003, 0.200000003, 0.200000003, 0.349999994]]
Loading