X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Ftexture.cc;h=3af8116b5e66d62da4afca37543530c7e3849c34;hp=3aebec3fbd94b5b81febaf1f8b67300295eb82d9;hb=0d4fe99398b649a5471417f8497a828b5f128da1;hpb=b30241a8a51be904b22459a1d0cc3322e0a505d9

diff --git a/src/texture.cc b/src/texture.cc
index 3aebec3..3af8116 100644
--- a/src/texture.cc
+++ b/src/texture.cc
@@ -43,6 +43,17 @@ void bind_texture(Texture *tex, int tunit)
 	}
 }
 
+int next_pow2(int x)
+{
+	x--;
+	x = (x >> 1) | x;
+	x = (x >> 2) | x;
+	x = (x >> 4) | x;
+	x = (x >> 8) | x;
+	x = (x >> 16) | x;
+	return x + 1;
+}
+
 
 Image *Texture::default_img;
 
@@ -126,6 +137,16 @@ int Texture::get_size(int dim) const
 	return sz[dim];
 }
 
+int Texture::get_width() const
+{
+	return sz[0];
+}
+
+int Texture::get_height() const
+{
+	return sz[1];
+}
+
 unsigned int Texture::get_id() const
 {
 	return id;
@@ -164,7 +185,7 @@ void Texture::create(int xsz, int ysz, TextureType textype, unsigned int ifmt)
 	glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-	switch(type) {
+	switch(textype) {
 	case TEX_2D:
 		glTexImage2D(GL_TEXTURE_2D, 0, glifmt_from_ifmt(ifmt), xsz, ysz, 0, fmt, type, 0);
 		break;
@@ -245,6 +266,8 @@ void Texture::set_image_2d(const Image &img)
 	glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
 	glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
 #ifdef __GLEW_H__
 	if(GLEW_SGIS_generate_mipmap) {
 		glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
@@ -263,6 +286,7 @@ void Texture::set_image_2d(const Image &img)
 
 bool Texture::set_image_cube(const Image &img, int idx)
 {
+	unsigned int err;
 	if(idx < 0 || idx >= 6) {
 		return false;
 	}
@@ -276,7 +300,10 @@ bool Texture::set_image_cube(const Image &img, int idx)
 
 	target = GL_TEXTURE_CUBE_MAP;
 	glBindTexture(target, id);
-	assert(glGetError() == GL_NO_ERROR);
+	if((err = glGetError()) == GL_INVALID_OPERATION) {
+		return false;	// probably not a cubemap
+	}
+	assert(err == GL_NO_ERROR);
 	glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -301,15 +328,15 @@ bool Texture::set_image_cube(const Image &img)
 	int xsz = img.get_width();
 	int ysz = img.get_height();
 
-	if(xsz / 4 == ysz / 3) {
+	if((xsz << 8) / 4 == (ysz << 8) / 3) {
 		// horizontal cross, assume the vertical bit is center-left
 		return set_cube_multi(img, hcross[0], hcross[1], xsz / 4);
 	}
-	if(xsz / 3 == ysz / 4) {
+	if((xsz << 8) / 3 == (ysz << 8) / 4) {
 		// vertical cross, assume the horizontal bit is center-top (180-rotated image 5)
 		return set_cube_multi(img, vcross[0], vcross[1], ysz / 4, (1 << 5));
 	}
-	if(xsz / 3 == ysz / 2) {
+	if((xsz << 8) / 3 == (ysz << 8) / 2) {
 		// horizontal sixpack
 		return set_cube_multi(img, hsix[0], hsix[1], ysz / 2);
 	}
@@ -475,8 +502,10 @@ Texture *TextureSet::get_texture(const char *name, TextureType type, const DataM
 	if(nsize) {
 		fname = (char*)alloca(nsize);
 		dmap->lookup(name, fname, nsize);
+		//debug_log("texture lookup: %s -> %s\n", name, fname);
 	} else {
 		fname = (char*)name;
+		//debug_log("texture lookup failed, using: %s\n", fname);
 	}
 
 	std::map<std::string, Texture*>::const_iterator iter = data.find(fname);
@@ -501,6 +530,7 @@ Texture *TextureSet::create_tex()
 bool TextureSet::load_tex(Texture *tex, const char *fname)
 {
 	Image *img = new Image;
+	img->name = fname;
 	if(!img->load(fname)) {
 		delete img;
 		return false;
@@ -514,6 +544,7 @@ bool TextureSet::load_tex(Texture *tex, const char *fname)
 
 bool TextureSet::done_tex(Texture *tex)
 {
+	//debug_log("TextureSet::done_tex [%s]\n", tex->img->name.c_str());
 	if(!tex->img) {
 		return false;
 	}