Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/draw.cc')
-rw-r--r--src/render/draw.cc35
1 files changed, 8 insertions, 27 deletions
diff --git a/src/render/draw.cc b/src/render/draw.cc
index 068c4dc..d54387a 100644
--- a/src/render/draw.cc
+++ b/src/render/draw.cc
@@ -137,25 +137,6 @@ void pass_prepare(float seconds)
/* ----- Skybox ---------------------------------------------------- */
-/*
-void draw_sphere_inside(math::Color const & color, float radius)
-{
- gl::scale(radius, radius, radius);
- gl::color(color);
-
- size_t index = (model::SPHERESEGMENTS) * (model::SPHERESEGMENTS - 1);
- size_t count = (model::SPHERESEGMENTS) * 2;
-
- // draw body
- for (int j = 0; j < (model::SPHERESEGMENTS - 1) / 2; j++) {
- glDrawArrays(gl::QuadStrip, index, count);
- index += count;
- Stats::quads += count / 2 - 1;
- }
-
-}
-*/
-
void draw_pass_sky()
{
if (!(r_sky && r_sky->value()))
@@ -167,7 +148,7 @@ void draw_pass_sky()
if (!core::localplayer()->zone()->sky().size())
return;
- Sky::draw(core::localplayer()->zone()->sky());
+ Sky::draw(core::localplayer()->zone()->sky(), (r_wireframe && r_wireframe->value()));
}
@@ -1219,17 +1200,17 @@ void draw(float seconds)
// calculate client state
pass_prepare(seconds);
- // enable wireframe mode if requested
- if (r_wireframe && r_wireframe->value()) {
- glPolygonMode(GL_FRONT, GL_LINE);
- } else {
- glPolygonMode(GL_FRONT, GL_FILL);
- }
-
gl::disable(GL_DEPTH_TEST);
gl::depthmask(GL_FALSE); // disable depth buffer writing
+ glPolygonMode(GL_FRONT, GL_FILL);
+
draw_pass_sky(); // draw the skybox
+
+ // enable wireframe mode if requested
+ if (r_wireframe && r_wireframe->value()) {
+ glPolygonMode(GL_FRONT, GL_LINE);
+ }
// set vertex array pointers
glInterleavedArrays(GL_T2F_N3F_V3F, 0, core::game()->vertexarray()->ptr());