eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

build 180131. support for nested material attribute definitions, minor bug fixes, refactoring and master branch unifications

Browse Source
This commit is contained in:
tmj-fstate
2018-01-31 16:07:50 +01:00
parent 6696a3536d
commit 23761dc665
20 changed files with 172 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uilayer.h
View File

@@ -3,7 +3,6 @@
#include <string>
#include "texture.h"
#include "float3d.h"
// GuiLayer -- basic user interface class. draws requested information on top of openGL screen
@@ -11,10 +10,10 @@ struct ui_panel {
struct text_line {
float4 color;
glm::vec4 color;
std::string data;
text_line( std::string const &Data, float4 const &Color):
text_line( std::string const &Data, glm::vec4 const &Color):
data(Data), color(Color)
{}
};
@@ -84,7 +83,7 @@ private:
print( std::string const &Text );
// draws a quad between coordinates x,y and z,w with uv-coordinates spanning 0-1
void
quad( float4 const &Coordinates, float4 const &Color );
quad( glm::vec4 const &Coordinates, glm::vec4 const &Color );
// members: