Skip to content

Commit

Permalink
[#159540329] Use ImVue library for Imgui rendering
Browse files Browse the repository at this point in the history
Declarative bindings, powered by Lua should have far better performance.

Misc
----

- fixed getting homedir on Windows bug in projectWizard.
  • Loading branch information
Artem Chernyshev committed Jun 25, 2019
1 parent c6d4c5b commit e5b8ce6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ matrix:
- libglew-dev
- compiler: clang
os: osx
osx_image: xcode9.1
osx_image: xcode9.4
env:
- OGRE_ENABLED=0
- GSAGE_VERSION_BUILD=${TRAVIS_BUILD_NUMBER}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ You can read more documentation on [http://engine.readthedocs.io/](http://engine

This engine supports three OS at the moment:
* Windows, Visual Studio 2017 and later.
* OSX, ci is using Xcode 9.1.
* OSX, ci is using Xcode 9.4.
* Linux, ci is using Ubuntu 16.04 with GCC 5.4.

There are plans to support iOS and Android.
Expand Down
4 changes: 2 additions & 2 deletions resources/scripts/editor/projectManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ function ProjectManager:create(settings, onProgress, onComplete)
end
message(msg, color)

if percent == 100 then
if percent >= 99.9 then
finalize(true)
end
end
Expand Down Expand Up @@ -337,7 +337,7 @@ function ProjectManager:create(settings, onProgress, onComplete)
message(msg, color)
percent = percent + step / filecount

if percent == 100 then
if percent >= 99.9 then
finalize(true)
end
end
Expand Down
4 changes: 2 additions & 2 deletions resources/scripts/imgui/projectWizard.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ProjectWizard = class(ImguiWindow, function(self, textureID, title, open)

local state = editor:getGlobalState()
self.fileDialogState = state.fileDialogState or {}
local dialogFolder = self.fileDialogState.folder or os.getenv("HOME")
local dialogFolder = self.fileDialogState.folder or fs.path.homedir()
local recent = projectManager:getRecentProjects(5)
self.data = {
wizard = core.settings.projectWizard,
Expand Down Expand Up @@ -168,7 +168,7 @@ function ProjectWizard:runCreationFlow(project)
end

pageData.settings = {
projectPath = fileDialogState.folder or os.getenv("HOME"),
projectPath = fileDialogState.folder or fs.path.homedir(),
projectName = projectType .. " project",
projectType = projectType,
resources = template.resources,
Expand Down
3 changes: 3 additions & 0 deletions resources/scripts/lib/filesystem.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ local fs = {
end,
exists = function(path)
return cfs:exists(path)
end,
homedir = function(path)
return os.getenv("HOME") or os.getenv("USERPROFILE")
end
},
rmdir = function(path, recursive)
Expand Down

0 comments on commit e5b8ce6

Please sign in to comment.