diff --git a/Makefile b/Makefile index 9b59ee8..baa0360 100755 --- a/Makefile +++ b/Makefile @@ -20,14 +20,14 @@ SOURCES = $(shell find $(SRCDIR) -type f -name "*.c") OBJECTS = $(patsubst %.c,$(BUILDDIR)/%.o,$(SOURCES)) DEPENDENCIES = $(patsubst %.c,$(BUILDDIR)/%.d,$(SOURCES)) -instanced_cubes: instanced_cubes.c +sandbox: opengl_sandbox/main.c $(CC) $(CFLAGS) $(LDFLAGS) $(WARNINGS) $(DEBUG)-o $@ $< -gl_run: instanced_cubes +gl_run: sandbox ./$< gl_clean: - rm instanced_cubes + rm sandbox all: $(BINDIR)/gem-graph-client diff --git a/instanced_cubes b/instanced_cubes deleted file mode 100755 index 148b47e..0000000 Binary files a/instanced_cubes and /dev/null differ diff --git a/instanced_cubes.c b/opengl_sandbox/main.c similarity index 99% rename from instanced_cubes.c rename to opengl_sandbox/main.c index 5fdcbac..817d825 100755 --- a/instanced_cubes.c +++ b/opengl_sandbox/main.c @@ -496,7 +496,6 @@ static gboolean on_render(GtkGLArea *area, GdkGLContext *context) glUniform4f(glGetUniformLocation(shader_program, "FragColor"), 1.0f, 0.0f, 0.0f, 1.0f); // Red, opaque // Bind the arrow VAO and use the same transformation matrices - glBindVertexArray(arrow_vao); glUniformMatrix4fv(projectionLoc, 1, GL_FALSE, (const GLfloat *)projection); glUniformMatrix4fv(viewLoc, 1, GL_FALSE, (const GLfloat *)view);