Skip to content

Commit

Permalink
Splash screen
Browse files Browse the repository at this point in the history
  • Loading branch information
dfranx committed Apr 2, 2020
1 parent caa3971 commit 7f34d4e
Show file tree
Hide file tree
Showing 9 changed files with 377 additions and 240 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[v1.3.2]
+ add texture properties
+ add shader variables that point to shader properties
+ add shader variables that point to pipeline item properties
+ add a splash screen
+ add "Changelog" popup which shows up on startup after an update
+ add "Show tips on startup" option
+ add "This will unassign Shortcut.ID" popup when changing shortcuts
Expand Down
20 changes: 20 additions & 0 deletions Misc/tips.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<tips>
<tip author="dfranx">
<title>Input layout / Vertex attributes</title>
<text>To render the geometry, you have to specify the format of the vertex buffer. This is done through the input layout manager (right click on shader pass -> Input layout).
Following vertex attributes are currently available:
* POSITION
* NORMAL
* TEXCOORD
* TANGENT
* BITANGENT
* COLOR</text>
</tip>


<tip author="dfranx">
<title>Resource manager</title>
<text>You can reorder resources bound to the shader pass through the resource manager. To access the resource manager, right click on the desired shader pass and press the "Resources" button.</text>
</tip>
</tips>
Binary file added bin/data/splash_screen_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/data/splash_screen_text_black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/data/splash_screen_text_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/SHADERed/EditorEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace ed {
: m_ui(&m_interface, wnd, gl)
, m_interface(&m_ui)
{
m_interface.Plugins.Init(&m_interface, &m_ui); // load plugins (TODO: move this to the splash screen)
}
void EditorEngine::Create()
{
Expand Down
Loading

0 comments on commit 7f34d4e

Please sign in to comment.