Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/Makefile.am8
-rw-r--r--src/client/view.cc6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 1b504c4..0d74532 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,13 +1,13 @@
METASOURCES = AUTO
INCLUDES = -I$(top_srcdir)/src
-libclient_la_SOURCES = camera.cc chat.cc client.cc console.cc draw.cc hud.cc \
- input.cc keyboard.cc video.cc view.cc
+libclient_la_SOURCES = camera.cc chat.cc client.cc console.cc hud.cc input.cc \
+ keyboard.cc video.cc view.cc
libclient_la_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS)
libclient_la_LDFLAGS = -avoid-version -no-undefined $(GL_LIBS) $(LIBSDL_LIBS)
noinst_LTLIBRARIES = libclient.la
-noinst_HEADERS = camera.h chat.h client.h console.h draw.h input.h keyboard.h \
- video.h view.h
+noinst_HEADERS = camera.h chat.h client.h console.h input.h keyboard.h video.h \
+ view.h
libclient_la_LIBADD = $(top_builddir)/src/core/libcore.la \
$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/math/libmath.la \
$(top_builddir)/src/render/librender.la $(top_builddir)/src/sys/libsys.la
diff --git a/src/client/view.cc b/src/client/view.cc
index bf69072..0a5c44e 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -16,7 +16,7 @@
#include "client/chat.h"
#include "client/console.h"
#include "client/video.h"
-#include "client/draw.h"
+#include "render/draw.h"
#include "render/render.h"
#include "core/core.h"
#include "math/mathlib.h"
@@ -188,7 +188,6 @@ void frame(float seconds)
gl::clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
if (core::application()->connected()) {
- // draw the game world
// Change to the projection matrix and set our viewing volume.
gl::matrixmode(GL_PROJECTION);
@@ -203,7 +202,8 @@ void frame(float seconds)
camera::draw(seconds); // draw the current camera transformation
- draw_world(seconds); // draw the world
+ render::draw(camera::target, seconds); // draw the world
+
}
// switch to ortographic projection to draw the GUI