From 5388c37bdc040ba50d21ec16a01f399d20592a90 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 3 May 2008 18:31:13 +0000 Subject: server frame time, rotation snap, flares --- src/core/model.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/core/model.cc') diff --git a/src/core/model.cc b/src/core/model.cc index c38749b..c6f5dde 100644 --- a/src/core/model.cc +++ b/src/core/model.cc @@ -185,6 +185,8 @@ Light::Light(math::Vector3f const & location, math::Color const & color, bool st light_frequency = 1.0f; light_offset = 0.0f; light_time = 0.5f; + light_flare = 0; + render_texture = 0; } Light::~Light() @@ -253,6 +255,7 @@ Model::Model(std::string const & name) : float class_frequency = 1.0f; float class_offset = 0; float class_time = 0.0f; + unsigned int class_flare = 0; bool brush_detail = false; while (ifs) { @@ -275,6 +278,7 @@ Model::Model(std::string const & name) : class_offset = 0; class_frequency = 1.0f; class_time = 0.0f; + class_flare = 0; brush_detail = false; } level ++; @@ -309,6 +313,8 @@ Model::Model(std::string const & name) : light->light_frequency = class_frequency; if (class_time > 0 ) light->light_time = class_time; + if (class_flare > 0) + light->light_flare = class_flare; add_light(light); } @@ -415,6 +421,15 @@ Model::Model(std::string const & name) : std::istringstream is(tmp); is >> class_time; + } else if (firstword == "\"flare\"") { + std::string tmp; + char c; + while ((linestream.get(c)) && (c != '"')); + while ((linestream.get(c)) && (c != '"')) + tmp += c; + std::istringstream is(tmp); + is >> class_flare; + } else if (firstword == "(") { if ((level == 2) && (class_name == "worldspawn")) { //cout << " BRUSH PLANE" << std::endl; -- cgit v1.2.3