projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- shaders for both lightmapped objects with or without albedo maps
[laserbrain_demo]
/
src
/
material.cc
diff --git
a/src/material.cc
b/src/material.cc
index
ac8c112
..
0aa83cd
100644
(file)
--- a/
src/material.cc
+++ b/
src/material.cc
@@
-2,6
+2,8
@@
#include <string.h>
#include "opengl.h"
#include "material.h"
#include <string.h>
#include "opengl.h"
#include "material.h"
+#include "sdr.h"
+#include "app.h"
Material::Material()
: diffuse(1.0f, 1.0f, 1.0f)
Material::Material()
: diffuse(1.0f, 1.0f, 1.0f)
@@
-24,6
+26,10
@@
void Material::setup() const
for(int i=0; i<ntex; i++) {
bind_texture(textures[i], i);
}
for(int i=0; i<ntex; i++) {
bind_texture(textures[i], i);
}
+
+ 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)