Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/model/parts.cc
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/model/parts.cc')
-rw-r--r--src/model/parts.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/model/parts.cc b/src/model/parts.cc
index ac54410..e71ad16 100644
--- a/src/model/parts.cc
+++ b/src/model/parts.cc
@@ -6,7 +6,8 @@
#include "model/parts.h"
-namespace model {
+namespace model
+{
/* ---- class Light ------------------------------------------------ */
@@ -24,12 +25,12 @@ Light::Light() :
light_time = 0.5f;
light_flare = 0;
-
+
light_texture = 0;
}
Light::Light(const Light& other) : Part(other),
- light_color(other.color())
+ light_color(other.color())
{
light_entity = other.entity();
light_engine = other.engine();
@@ -41,7 +42,7 @@ Light::Light(const Light& other) : Part(other),
light_time = other.time();
light_flare = other.flare();
-
+
light_texture = other.texture();
}
Light::~Light()
@@ -105,8 +106,8 @@ SubModel::SubModel() : Part()
}
SubModel::SubModel(const SubModel& other) : Part(other),
- submodel_name(other.name()),
- submodel_axis(other.axis())
+ submodel_name(other.name()),
+ submodel_axis(other.axis())
{
submodel_scale = other.scale();
}