Skip to content

Commit

Permalink
Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Amaranthos committed Oct 23, 2017
1 parent 21640d2 commit ab40918
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 28 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,4 +1,5 @@
.dub
dub.selections.json
docs.json
__dummy.html
*.o
Expand Down
10 changes: 0 additions & 10 deletions dub.selections.json

This file was deleted.

32 changes: 16 additions & 16 deletions source/d2d/constants.d
Expand Up @@ -6,21 +6,21 @@ import gl3n.linalg : vec4, vec2;
* Constants
*/
static class Constants {
static {
public enum shaderPositionLoc = 0;
public enum shaderColourLoc = 1;
public enum shaderUVLoc = 2;
public enum countVerts = 6;
public enum framerateSamples = 10;
public enum tileSize = 64;
public enum uvs = vec4(0f, 0f, 1f, 1f);
public enum milliseconds = 1000;
public enum maxProfilerSamples = 100;
public enum maxTextureRes = 4069;
public enum right = vec2(1f, 0f);
static public {
enum shaderPositionLoc = 0;
enum shaderColourLoc = 1;
enum shaderUVLoc = 2;
enum countVerts = 6;
enum framerateSamples = 10;
enum tileSize = 64;
enum uvs = vec4(0f, 0f, 1f, 1f);
enum milliseconds = 1000;
enum maxProfilerSamples = 100;
enum maxTextureRes = 4069;
enum right = vec2(1f, 0f);

// TODO: Move to default shaders class?
public enum defaultSpriteVertSrc =
enum defaultSpriteVertSrc =
`#version 410
layout(location = 0) in vec2 position;
Expand All @@ -39,7 +39,7 @@ static class Constants {
}
`;

public enum defaultSpriteFragSrc =
enum defaultSpriteFragSrc =
`#version 410
in vec4 fragColour;
Expand All @@ -54,7 +54,7 @@ static class Constants {
}
`;

public enum defaultLightVertSrc =
enum defaultLightVertSrc =
`#version 410
layout(location = 0) in vec2 position;
Expand All @@ -73,7 +73,7 @@ static class Constants {
}
`;

public enum defaultLightFragSrc =
enum defaultLightFragSrc =
`#version 410
in vec4 fragColour;
Expand Down
4 changes: 2 additions & 2 deletions source/d2d/errors.d
@@ -1,12 +1,12 @@
module d2d.errors;

import std.stdio : writeln, readln, stdout;
import std.stdio : writeln, readln, stdout, stderr;
import core.stdc.stdlib : exit;

import derelict.sdl2.sdl : SDL_Quit;

public static void fatalError(in string error) {
writeln(error ~ "\nExiting...");
stderr.writeln(error ~ "\nExiting...");
stdout.flush();
SDL_Quit();
exit(1);
Expand Down

0 comments on commit ab40918

Please sign in to comment.