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>2008-07-24 00:47:13 +0000
committerStijn Buys <ingar@osirion.org>2008-07-24 00:47:13 +0000
commitaaa4ff61f7b17759c4f4ccb3ac9011dd5f8a93f5 (patch)
treefafec5ef0c99f28cfa6b5b652d98b63b7a4673de /src/model/map.cc
parent11c122eb1cc86ca1a40c84eb411ccd97791dc47d (diff)
primary, secondary, tertiary color rendering
Diffstat (limited to 'src/model/map.cc')
-rw-r--r--src/model/map.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/model/map.cc b/src/model/map.cc
index 405ce98..ad569eb 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -462,21 +462,21 @@ void Map::make_brushface(Plane *face)
} else if (face->texture().compare("colors/blue") == 0) {
color.assign(0, 0, 1);
- } else if ((face->texture().compare("common/entity") == 0) || (face->texture().compare("common/primary") == 0)) {
+ } else if (face->texture().compare("common/entity") == 0) {
material |= Material::Primary;
- } else if (face->texture().compare("common/primary_dark") == 0) {
+ } else if (face->texture().compare("common/entity_dark") == 0) {
material |= Material::Primary;
material |= Material::Dark;
- } else if (face->texture().compare("common/secundary") == 0) {
+ } else if (face->texture().compare("common/entity_second") == 0) {
material |= Material::Secondary;
- } else if (face->texture().compare("common/secundary_dark") == 0) {
+ } else if (face->texture().compare("common/entity_second_dark") == 0) {
material |= Material::Secondary;
material |= Material::Dark;
- } else if (face->texture().compare("common/tertiary") == 0) {
+ } else if (face->texture().compare("common/entity_third") == 0) {
material |= Material::Tertiary;
- } else if (face->texture().compare("common/tertiary_dark") == 0) {
+ } else if (face->texture().compare("common/entity_thirdy_dark") == 0) {
material |= Material::Tertiary;
material |= Material::Dark;
}