Skip to content

Commit

Permalink
Renaming gui2 to gui
Browse files Browse the repository at this point in the history
  • Loading branch information
Aldo committed Sep 9, 2019
1 parent 69fb85f commit b5e9445
Show file tree
Hide file tree
Showing 33 changed files with 78 additions and 118 deletions.
3 changes: 1 addition & 2 deletions dub.json
View file
Expand Up @@ -17,8 +17,7 @@
"dnogc": "~master",
"decs": "~>1.0.3",
"inifiled": "~>1.3.1",
"dlib": "~>0.16.0",
"evael-lib": "~>0.0.1"
"dlib": "~>0.16.0"
},
"targetType": "library",
"copyFiles-windows-x86": ["dist/x86/*.dll"],
Expand Down
15 changes: 1 addition & 14 deletions dub.selections.json
View file
Expand Up @@ -2,31 +2,18 @@
"fileVersion": 1,
"versions": {
"bindbc-freeimage": "0.1.1",
"bindbc-freetype": "0.1.0",
"bindbc-glfw": "0.5.0",
"bindbc-loader": "0.2.1",
"bindbc-nuklear": "0.1.4",
"bindbc-openal": "0.2.0",
"bindbc-opengl": "0.8.0",
"ctini": "0.2.1",
"decs": "1.0.3",
"derelict-al": "2.0.0-beta.2",
"derelict-fi": "3.0.0-beta.1",
"derelict-ft": "1.0.2",
"derelict-gl3": "2.0.0-beta.8",
"derelict-glfw3": "4.0.0-beta.1",
"derelict-nanovg": "1.1.0",
"derelict-util": "3.0.0-beta.2",
"derelict_extras-sndfile": "3.1.0",
"dlib": "0.16.0",
"dnogc": "~master",
"evael-lib": "0.0.1",
"inifiled": "1.3.1",
"jsonizer": "0.7.6",
"mir-linux-kernel": "1.0.1",
"msgpack-d": "1.0.1",
"pegged": "~master",
"tanya": "0.16.1",
"unit-threaded": "0.10.3"
"msgpack-d": "1.0.1"
}
}
1 change: 0 additions & 1 deletion source/evael/audio/al.d
View file
Expand Up @@ -4,7 +4,6 @@ debug import dnogc.Utils;

public import bindbc.openal;


struct al
{
static string file = __FILE__;
Expand Down
2 changes: 1 addition & 1 deletion source/evael/core/game.d
View file
Expand Up @@ -13,7 +13,7 @@ import evael.core.game_config;

import evael.graphics.graphics_device;
import evael.graphics.font;
import evael.graphics.gui2.gui_manager;
import evael.graphics.gui.gui_manager;

import evael.audio.audio_device;

Expand Down
2 changes: 1 addition & 1 deletion source/evael/core/game_state.d
View file
Expand Up @@ -6,7 +6,7 @@ import evael.core.game;

import evael.graphics.graphics_device;
import evael.graphics.drawable;
import evael.graphics.gui2.gui_manager;
import evael.graphics.gui.gui_manager;

import evael.system.input;
import evael.system.asset_loader;
Expand Down
10 changes: 2 additions & 8 deletions source/evael/graphics/environment.d
View file
Expand Up @@ -8,8 +8,6 @@ import evael.graphics.lights;

import evael.utils.math;

import evael.memory;

import dnogc.DynamicArray;

/**
Expand Down Expand Up @@ -38,16 +36,15 @@ class Environment
* Params:
* graphics : graphics device
*/
@nogc
public this(GraphicsDevice graphics) nothrow
{
this.m_graphicsDevice = graphics;

this.m_sunProjection = orthoMatrix(-300.0f, 300.0f, -300.0f, 300.0f, -300.0f, 300.0f);

this.m_ambientLight = New!AmbientLight(vec3(1.0, 1.0, 1.0));
this.m_ambientLight = new AmbientLight(vec3(1.0, 1.0, 1.0));

this.m_sun = New!DirectionalLight();
this.m_sun = new DirectionalLight();
this.m_sun.direction = vec3(1.0, 1.0, 1.0);
this.m_sun.ambient = vec3(1.0, 1.0, 1.0);
this.m_sun.diffuse = vec3(1.0, 1.0, 1.0);
Expand All @@ -59,9 +56,6 @@ class Environment
*/
public void dispose()
{
Delete(this.m_ambientLight);
Delete(this.m_sun);

this.m_pointsLights.dispose();
}

Expand Down
2 changes: 1 addition & 1 deletion .../evael/graphics/gui2/core/input_handler.d → ...e/evael/graphics/gui/core/input_handler.d
View file
@@ -1,4 +1,4 @@
module evael.graphics.gui2.core.input_handler;
module evael.graphics.gui.core.input_handler;

import bindbc.nuklear;
import bindbc.glfw;
Expand Down
2 changes: 1 addition & 1 deletion source/evael/graphics/gui2/core/renderer.d → source/evael/graphics/gui/core/renderer.d
View file
@@ -1,4 +1,4 @@
module evael.graphics.gui2.core.renderer;
module evael.graphics.gui.core.renderer;

import bindbc.nuklear;
import bindbc.glfw;
Expand Down
10 changes: 5 additions & 5 deletions source/evael/graphics/gui2/gui_manager.d → source/evael/graphics/gui/gui_manager.d
View file
@@ -1,4 +1,4 @@
module evael.graphics.gui2.gui_manager;
module evael.graphics.gui.gui_manager;

import core.stdc.string : memcpy, memset;
import core.stdc.stdlib : free, malloc;
Expand All @@ -7,12 +7,12 @@ import std.stdio;
import bindbc.glfw;
import bindbc.nuklear;

import evael.graphics.gui2.style;
import evael.graphics.gui.style;

import evael.graphics.gui2.core.renderer;
import evael.graphics.gui2.core.input_handler;
import evael.graphics.gui.core.renderer;
import evael.graphics.gui.core.input_handler;

import evael.graphics.gui2.widgets.window;
import evael.graphics.gui.widgets.window;

import evael.graphics.graphics_device;
import evael.graphics.texture;
Expand Down
14 changes: 3 additions & 11 deletions source/evael/graphics/gui2/layouts/layout.d → source/evael/graphics/gui/layouts/layout.d
View file
@@ -1,8 +1,9 @@
module evael.graphics.gui2.layouts.layout;
module evael.graphics.gui.layouts.layout;

import bindbc.nuklear : nk_context, nk_layout_row_dynamic, nk_layout_row_static;

import evael.graphics.gui2.layouts.layout_params;
import evael.graphics.gui.layouts.layout_params;
import evael.graphics.gui.layouts.layout_interface;

alias DynamicLayout = Layout!(LayoutType.Dynamic);
alias StaticLayout = Layout!(LayoutType.Static);
Expand Down Expand Up @@ -43,13 +44,4 @@ class Layout(LayoutType T) : ILayout
nk_layout_row_static(nuklearContext, this.m_params.height, this.m_params.columns, this.m_params.width);
}
}
}

/**
* Layout interface.
*/
interface ILayout
{
@nogc
public void apply(nk_context* nuklear) nothrow;
}
2 changes: 1 addition & 1 deletion .../graphics/gui2/layouts/layout_interface.d → ...l/graphics/gui/layouts/layout_interface.d
View file
@@ -1,4 +1,4 @@
module evael.graphics.gui2.layouts.layout_interface;
module evael.graphics.gui.layouts.layout_interface;

import bindbc.nuklear : nk_context;

Expand Down
2 changes: 1 addition & 1 deletion ...ael/graphics/gui2/layouts/layout_params.d → ...vael/graphics/gui/layouts/layout_params.d
View file
@@ -1,4 +1,4 @@
module evael.graphics.gui2.layouts.layout_params;
module evael.graphics.gui.layouts.layout_params;

struct LayoutParams
{
Expand Down
7 changes: 7 additions & 0 deletions source/evael/graphics/gui/layouts/package.d
View file
@@ -0,0 +1,7 @@
module evael.graphics.gui.layouts;

public
{
import evael.graphics.gui.layouts.layout;
import evael.graphics.gui.layouts.layout_params;
}
9 changes: 9 additions & 0 deletions source/evael/graphics/gui/package.d
View file
@@ -0,0 +1,9 @@
module evael.graphics.gui;

public
{
import evael.graphics.gui.gui_manager;
import evael.graphics.gui.style;
import evael.graphics.gui.widgets;
import evael.graphics.gui.layouts;
}
2 changes: 1 addition & 1 deletion source/evael/graphics/gui2/style.d → source/evael/graphics/gui/style.d
View file
@@ -1,4 +1,4 @@
module evael.graphics.gui2.style;
module evael.graphics.gui.style;

import bindbc.nuklear : nk_style_colors, nk_color;

Expand Down
4 changes: 2 additions & 2 deletions source/evael/graphics/gui2/widgets/button.d → source/evael/graphics/gui/widgets/button.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.button;
module evael.graphics.gui.widgets.button;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

class Button : Widget
{
Expand Down
4 changes: 2 additions & 2 deletions ...e/evael/graphics/gui2/widgets/check_box.d → ...ce/evael/graphics/gui/widgets/check_box.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.check_box;
module evael.graphics.gui.widgets.check_box;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

class CheckBox : Widget
{
Expand Down
4 changes: 2 additions & 2 deletions ...vael/graphics/gui2/widgets/color_picker.d → ...evael/graphics/gui/widgets/color_picker.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.color_picker;
module evael.graphics.gui.widgets.color_picker;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

import evael.utils.color;

Expand Down
4 changes: 2 additions & 2 deletions ...e/evael/graphics/gui2/widgets/combo_box.d → ...ce/evael/graphics/gui/widgets/combo_box.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.combo_box;
module evael.graphics.gui.widgets.combo_box;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

class ComboBox : Widget
{
Expand Down
4 changes: 2 additions & 2 deletions source/evael/graphics/gui2/widgets/input.d → source/evael/graphics/gui/widgets/input.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.input;
module evael.graphics.gui.widgets.input;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

enum InputType
{
Expand Down
4 changes: 2 additions & 2 deletions source/evael/graphics/gui2/widgets/label.d → source/evael/graphics/gui/widgets/label.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.label;
module evael.graphics.gui.widgets.label;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

class Label : Widget
{
Expand Down
19 changes: 19 additions & 0 deletions source/evael/graphics/gui/widgets/package.d
View file
@@ -0,0 +1,19 @@
module evael.graphics.gui.widgets;

public
{
import evael.graphics.gui.widgets.widget;

import evael.graphics.gui.widgets.window;
import evael.graphics.gui.widgets.button;
import evael.graphics.gui.widgets.radio_button;
import evael.graphics.gui.widgets.color_picker;
import evael.graphics.gui.widgets.property;
import evael.graphics.gui.widgets.label;
import evael.graphics.gui.widgets.combo_box;
import evael.graphics.gui.widgets.input;
import evael.graphics.gui.widgets.slider;
import evael.graphics.gui.widgets.progress_bar;
import evael.graphics.gui.widgets.check_box;

}
4 changes: 2 additions & 2 deletions ...vael/graphics/gui2/widgets/progress_bar.d → ...evael/graphics/gui/widgets/progress_bar.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.progress_bar;
module evael.graphics.gui.widgets.progress_bar;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

enum ProgressBarType
{
Expand Down
4 changes: 2 additions & 2 deletions ...ce/evael/graphics/gui2/widgets/property.d → source/evael/graphics/gui/widgets/property.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.property;
module evael.graphics.gui.widgets.property;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

bool isAllowedType(T)()
{
Expand Down
4 changes: 2 additions & 2 deletions ...vael/graphics/gui2/widgets/radio_button.d → ...evael/graphics/gui/widgets/radio_button.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.radio_button;
module evael.graphics.gui.widgets.radio_button;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

class RadioButton : Widget
{
Expand Down
4 changes: 2 additions & 2 deletions source/evael/graphics/gui2/widgets/slider.d → source/evael/graphics/gui/widgets/slider.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.slider;
module evael.graphics.gui.widgets.slider;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

class Slider : Widget
{
Expand Down
4 changes: 2 additions & 2 deletions source/evael/graphics/gui2/widgets/widget.d → source/evael/graphics/gui/widgets/widget.d
View file
@@ -1,8 +1,8 @@
module evael.graphics.gui2.widgets.widget;
module evael.graphics.gui.widgets.widget;

public import bindbc.nuklear;

import evael.graphics.gui2.layouts.layout_interface;
import evael.graphics.gui.layouts.layout_interface;

abstract class Widget
{
Expand Down
4 changes: 2 additions & 2 deletions source/evael/graphics/gui2/widgets/window.d → source/evael/graphics/gui/widgets/window.d
View file
@@ -1,6 +1,6 @@
module evael.graphics.gui2.widgets.window;
module evael.graphics.gui.widgets.window;

import evael.graphics.gui2.widgets.widget;
import evael.graphics.gui.widgets.widget;

import evael.utils.rectangle;

Expand Down
7 changes: 0 additions & 7 deletions source/evael/graphics/gui2/layouts/package.d
View file

This file was deleted.

9 changes: 0 additions & 9 deletions source/evael/graphics/gui2/package.d
View file

This file was deleted.

19 changes: 0 additions & 19 deletions source/evael/graphics/gui2/widgets/package.d
View file

This file was deleted.

3 changes: 0 additions & 3 deletions source/evael/graphics/sprite_sheet.d
View file
Expand Up @@ -16,9 +16,6 @@ import evael.utils.color;
import evael.utils.size;
import evael.utils.rectangle;

import dnogc.DynamicArray;
import dnogc.Utils;

/**
* Spritesheet
* Draw animated sprite.
Expand Down

0 comments on commit b5e9445

Please sign in to comment.