projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simple ubershader system, reflection debugging
[laserbrain_demo]
/
src
/
material.cc
diff --git
a/src/material.cc
b/src/material.cc
index
6288ef4
..
a079c83
100644
(file)
--- a/
src/material.cc
+++ b/
src/material.cc
@@
-11,6
+11,9
@@
Material::Material()
shininess = 0.0f;
alpha = 1.0f;
memset(stdtex, 0, sizeof stdtex);
shininess = 0.0f;
alpha = 1.0f;
memset(stdtex, 0, sizeof stdtex);
+
+ reflect = 0.0f;
+ flat_mirror = false;
}
void Material::setup() const
}
void Material::setup() const
@@
-34,9
+37,11
@@
void Material::setup() const
}
}
}
}
+ /*
if(stdtex[MTL_TEX_LIGHTMAP]) {
bind_program(stdtex[MTL_TEX_DIFFUSE] ? sdr_ltmap : sdr_ltmap_notex);
}
if(stdtex[MTL_TEX_LIGHTMAP]) {
bind_program(stdtex[MTL_TEX_DIFFUSE] ? sdr_ltmap : sdr_ltmap_notex);
}
+ */
}
void Material::add_texture(Texture *tex, int type)
}
void Material::add_texture(Texture *tex, int type)
@@
-75,7
+80,7
@@
int mtl_parse_type(const char *str)
} else if(strcmp(str, "lightmap") == 0) {
return MTL_TEX_LIGHTMAP;
} else if(strcmp(str, "envmap") == 0) {
} else if(strcmp(str, "lightmap") == 0) {
return MTL_TEX_LIGHTMAP;
} else if(strcmp(str, "envmap") == 0) {
- return MTL_TEX_ENVMAP;
+ return MTL_TEX_REFLECT;
}
return MTL_TEX_UNKNOWN;
}
}
return MTL_TEX_UNKNOWN;
}
@@
-91,7
+96,7
@@
const char *mtl_type_string(int type)
return "normalmap";
case MTL_TEX_LIGHTMAP:
return "lightmap";
return "normalmap";
case MTL_TEX_LIGHTMAP:
return "lightmap";
- case MTL_TEX_ENVMAP:
+ case MTL_TEX_REFLECT:
return "envmap";
default:
break;
return "envmap";
default:
break;