Skip to content

Instantly share code, notes, and snippets.

@clonejo
Created September 1, 2012 20:19
Show Gist options
  • Select an option

  • Save clonejo/3586056 to your computer and use it in GitHub Desktop.

Select an option

Save clonejo/3586056 to your computer and use it in GitHub Desktop.
$ git diff remotes/origin/master master | cat
diff --git a/Makefile b/Makefile
index 1dfbe47..40fff0f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ DCFLAGS_IMPORT = -Ibrala/ -Isrc/d/derelict3/import -Isrc/d/glamour -Isrc/d/
DCFLAGS_LINK = $(LDCFLAGS) $(LINKERFLAG)-lssl $(LINKERFLAG)-lcrypto
ifeq ($(DC),ldc2)
- ADDITIONAL_FLAGS = -d-version=Derelict3 -d-version=gl3n -d-version=stb -d-debug -unittest -g -gc
+ ADDITIONAL_FLAGS = -d-version=Derelict3 -d-version=gl3n -d-version=stb -d-debug -g -gc
else
- ADDITIONAL_FLAGS = -version=Derelict3 -version=gl3n -version=stb -debug -unittest -g -gc
+ ADDITIONAL_FLAGS = -version=Derelict3 -version=gl3n -version=stb -debug -g -gc
endif
@@ -72,4 +72,4 @@ clean:
$(RM) build$(PATH_SEP)brala
clean-all:
- $(RM) build
\ No newline at end of file
+ $(RM) build
diff --git a/brala/main.d b/brala/main.d
index 0c957b2..d4d9783 100644
--- a/brala/main.d
+++ b/brala/main.d
@@ -102,10 +102,10 @@ BraLaEngine init_engine(void* window, AppArguments args, GLVersion glv) {
Image terrain = preprocess_terrain(engine.resmgr.get!Image("terrain"));
engine.resmgr.add("terrain", terrain.to_texture());
-// Image palette = palette_atlas(engine.resmgr.get!Image("grasscolor"),
-// engine.resmgr.get!Image("leavecolor"),
-// engine.resmgr.get!Image("watercolor"));
-// engine.resmgr.add("palette", palette);
+// Image palette = palette_atlas(engine.resmgr.get!Image("grasscolor"),
+// engine.resmgr.get!Image("leavecolor"),
+// engine.resmgr.get!Image("watercolor"));
+// engine.resmgr.add("palette", palette);
Sampler terrain_sampler = new Sampler();
terrain_sampler.set_parameter(GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -166,7 +166,7 @@ struct AppArguments {
"\tdisables \"snooping\" (= sending completly anonym information to mojang)",
- "specifies the number of threads used to tessellate the terrain, defaults to 3.\n" ~
+ "specifies the number of threads used to tessellate the terrain, defaults to 3.\n" ~
"\t\t\t\tMore threads: more used memory (each thread needs his own tessellation-buffer),\n" ~
"\t\t\t\tmore CPU usage, but faster terrain tessellation",
@@ -185,6 +185,10 @@ struct AppArguments {
int main() {
+import core.memory;
+
+GC.disable();
+
scope(exit) glfwTerminate();
auto args = get_options!AppArguments();
@@ -218,4 +222,4 @@ int main() {
game.start(args.host, args.port);
return 0;
-}
\ No newline at end of file
+}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment