Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Material Support #25

Merged
merged 19 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Stellar/vendor/nfd"]
path = Stellar/vendor/nfd
url = https://github.com/btzy/nativefiledialog-extended.git
14 changes: 6 additions & 8 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
"name": "Win32",
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/Stellar/vendor/imgui/"
"${workspaceFolder}/Stellar/vendor/imgui/",
"C:/VulkanSDK/1.3.224.1/Include"
],
"defines": [
"STLR_BUILD_DLL",
"__STRICT_ANSI__"
],
"compilerPath": "C:\\msys64\\mingw64\\bin\\g++.exe",
"cStandard": "gnu17",
"cppStandard": "gnu++17",
"intelliSenseMode": "linux-gcc-x64",
"configurationProvider": "ms-vscode.makefile-tools"
"compilerPath": "F:/Visual Studio/VC/Tools/MSVC/14.35.32215/bin/Hostx64/x64/cl.exe",
"cppStandard": "c++17",
"intelliSenseMode": "${default}"
},
{
"name": "Linux",
Expand All @@ -28,7 +26,7 @@
"cStandard": "gnu17",
"cppStandard": "c++17",
"intelliSenseMode": "linux-gcc-x64",
"configurationProvider": "ms-vscode.makefile-tools"
"configurationProvider": "ms-vscode.cmake-tools"
},
{
"name": "Mac",
Expand Down
107 changes: 25 additions & 82 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,84 +1,27 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Mac Launch(Release)",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/macOS/StellarEngine.app/Contents/MacOS/StellarEditor",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/StellarEditor/release/bin",
"environment": [{ "name": "DYLD_LIBRARY_PATH", "value": "${workspaceFolder}/StellarEditor/release/bin" }],
"externalConsole": false,
"MIMode": "lldb",
"preLaunchTask": "Build Engine(Release)"
},
{
"name": "Mac Launch(Debug)",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/StellarEditor/debug/bin/StellarEditor",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/StellarEditor/debug/bin",
"environment": [{ "name": "DYLD_LIBRARY_PATH", "value": "${workspaceFolder}/StellarEditor/debug/bin" }],
"externalConsole": false,
"MIMode": "lldb",
"preLaunchTask": "Build Engine(Debug)"
},
{
"name": "Linux Launch(Release)",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/StellarEditor/release/bin/StellarEditor",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/StellarEditor/release/bin/",
"environment": [ { "name": "LD_LIBRARY_PATH", "value": "${workspaceFolder}/StellarEditor/release/bin" }],
"externalConsole": false,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"description": "Set Disassembly Flavor to Intel",
"text": "-gdb-set disassembly-flavor intel",
"ignoreFailures": true
}
],
"preLaunchTask": "Build Engine(Release)"
},
{
"name": "Linux Launch(Debug)",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/StellarEditor/debug/bin/StellarEditor",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/StellarEditor/debug/bin/",
"environment": [ { "name": "LD_LIBRARY_PATH", "value": "${workspaceFolder}/StellarEditor/debug/bin" }],
"externalConsole": false,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"description": "Set Disassembly Flavor to Intel",
"text": "-gdb-set disassembly-flavor intel",
"ignoreFailures": true
}
],
"preLaunchTask": "Build Engine(Debug)"
}
]
"version": "0.2.0",
"configurations": [
{
"name": "Windows Launch",
"type": "cppvsdbg",
"request": "launch",
// Resolved by CMake Tools:
"program": "${command:cmake.launchTargetPath}",
"args": [],
"stopAtEntry": false,
"cwd": "${command:cmake.getLaunchTargetDirectory}",
"environment": [
{
"name": "PATH",
"value": "${env:PATH}:${command:cmake.getLaunchTargetDirectory}"
},
{
"name": "OTHER_VALUE",
"value": "Something something"
}
],
"console": "integratedTerminal",
"internalConsoleOptions": "openOnSessionStart",
}
]
}
110 changes: 4 additions & 106 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,108 +1,6 @@
{
"files.associations": {
"*.ejs": "html",
"*.env.*": "env",
"*.S": "nasm",
"__config": "cpp",
"__errc": "cpp",
"__hash_table": "cpp",
"__bit_reference": "cpp",
"__bits": "cpp",
"__debug": "cpp",
"__locale": "cpp",
"__mutex_base": "cpp",
"__node_handle": "cpp",
"__nullptr": "cpp",
"__split_buffer": "cpp",
"__string": "cpp",
"__threading_support": "cpp",
"__tree": "cpp",
"__tuple": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"cfenv": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"exception": "cpp",
"coroutine": "cpp",
"format": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"random": "cpp",
"ranges": "cpp",
"ratio": "cpp",
"regex": "cpp",
"semaphore": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"span": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string": "cpp",
"string_view": "cpp",
"strstream": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"valarray": "cpp",
"variant": "cpp",
"vector": "cpp",
"__functional_base": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"utility": "cpp",
"*.tcc": "cpp",
"stop_token": "cpp",
"filesystem": "cpp"
},
"C_Cpp.errorSquiggles": "Enabled",
"restructuredtext.syntaxHighlighting.disabled": true
"restructuredtext.syntaxHighlighting.disabled": true,
"cmake.configureOnOpen": true,
"esbonio.sphinx.confDir": "",
"C_Cpp.default.configurationProvider": "ms-vscode.makefile-tools"
}
55 changes: 0 additions & 55 deletions .vscode/tasks.json

This file was deleted.

34 changes: 34 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
cmake_minimum_required (VERSION 3.24.0 FATAL_ERROR)

if (WIN32)
# Change this to your own vcpkg installation folder
set(ENV{VCPKG_ROOT} "F:/Dev/vcpkg")
endif()

if(UNIX AND NOT APPLE)
set(ENV{VCPKG_ROOT} "/home/gellert/Documents/vcpkg")
endif()

set(vcpkg "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
if(NOT CMAKE_TOOLCHAIN_FILE AND EXISTS "${vcpkg}")
set(CMAKE_TOOLCHAIN_FILE "${vcpkg}"
CACHE FILEPATH "CMake toolchain file")
message(STATUS "vcpkg toolchain found: ${CMAKE_TOOLCHAIN_FILE}")
endif()

set(VCPKG_TARGET_TRIPLET x64-windows-static)

project(StellarEngine)

set(CMAKE_CXX_STANDARD 17
CACHE STRING "C++ standard to use")

if (CMAKE_CXX_STANDARD LESS 17)
message(FATAL_ERROR "Must compile `test` with C++17 or newer")
endif ()

set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

add_subdirectory(Stellar)
add_subdirectory(StellarEditor)
#add_subdirectory(docs)
35 changes: 0 additions & 35 deletions Makefile

This file was deleted.

Binary file modified Screenshots/currentStage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading