]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/irrlichtwrapper.cpp
.
[dragonfireclient.git] / src / irrlichtwrapper.cpp
index 51511eb34fcc6f7eb8fefee6e2352e263560b42f..fe4ff27712051b75e1163c2e89eb3a8579f51ef4 100644 (file)
@@ -1,4 +1,5 @@
 #include "irrlichtwrapper.h"
+#include "constants.h"
 
 IrrlichtWrapper::IrrlichtWrapper(IrrlichtDevice *device)
 {
@@ -51,16 +52,25 @@ video::ITexture* IrrlichtWrapper::getTexture(TextureSpec spec)
                // Throw a request in
                m_get_texture_queue.add(spec, 0, 0, &result_queue);
                
-               dstream<<"Waiting for texture "<<spec.name<<std::endl;
-
-               // Wait result
-               GetResult<TextureSpec, video::ITexture*, u8, u8>
-                               result = result_queue.pop_front(1000);
+               dstream<<"Waiting for texture from main thread: "
+                               <<spec.name<<std::endl;
                
-               // Check that at least something worked OK
-               assert(result.key.name == spec.name);
-
-               t = result.item;
+               try
+               {
+                       // Wait result for a second
+                       GetResult<TextureSpec, video::ITexture*, u8, u8>
+                                       result = result_queue.pop_front(1000);
+               
+                       // Check that at least something worked OK
+                       assert(result.key.name == spec.name);
+
+                       t = result.item;
+               }
+               catch(ItemNotFoundException &e)
+               {
+                       dstream<<"Waiting for texture timed out."<<std::endl;
+                       t = NULL;
+               }
        }
 
        // Add to cache and return
@@ -102,33 +112,61 @@ video::ITexture* IrrlichtWrapper::getTextureDirect(TextureSpec spec)
 video::ITexture * CrackTextureMod::make(video::ITexture *original,
                const char *newname, video::IVideoDriver* driver)
 {
+       // Size of the base image
        core::dimension2d<u32> dim(16, 16);
+       // Size of the crack image
+       //core::dimension2d<u32> dim_crack(16, 16 * CRACK_ANIMATION_LENGTH);
+       // Position to copy the crack to in the base image
        core::position2d<s32> pos_base(0, 0);
+       // Position to copy the crack from in the crack image
        core::position2d<s32> pos_other(0, 16 * progression);
 
        video::IImage *baseimage = driver->createImage(original, pos_base, dim);
        assert(baseimage);
+
+       video::IImage *crackimage = driver->createImageFromFile(porting::getDataPath("crack.png").c_str());
+       assert(crackimage);
+       
+#if 0
+       video::ITexture *other = driver->getTexture(porting::getDataPath("crack.png").c_str());
        
-       video::ITexture *other = driver->getTexture("../data/crack.png");
+       dstream<<__FUNCTION_NAME<<": crack texture size is "
+                       <<other->getSize().Width<<"x"
+                       <<other->getSize().Height<<std::endl;
+
        // We have to get the whole texture because getting a smaller area
        // messes the whole thing. It is probably a bug in Irrlicht.
+       // NOTE: This doesn't work probably because some systems scale
+       //       the image to fit a texture or something...
        video::IImage *otherimage = driver->createImage(
                        other, core::position2d<s32>(0,0), other->getSize());
 
        assert(otherimage);
+
+       // Now, the image might be 80 or 128 high depending on the computer
+       // Let's make an image of the right size and copy the possibly
+       // wrong sized one with scaling
+       // NOTE: This is an ugly hack.
+
+       video::IImage *crackimage = driver->createImage(
+                       baseimage->getColorFormat(), dim_crack);
        
-       /*core::rect<s32> clip_rect(v2s32(0,0), dim);
-       otherimage->copyToWithAlpha(baseimage, v2s32(0,0),
-                       core::rect<s32>(pos_other, dim),
-                       video::SColor(255,255,255,255),
-                       &clip_rect);*/
+       assert(crackimage);
        
-       otherimage->copyToWithAlpha(baseimage, v2s32(0,0),
+       otherimage->copyToScaling(crackimage);
+       otherimage->drop();
+#endif
+
+       // Then copy the right part of crackimage to baseimage
+       
+       crackimage->copyToWithAlpha(baseimage, v2s32(0,0),
                        core::rect<s32>(pos_other, dim),
                        video::SColor(255,255,255,255),
                        NULL);
        
-       otherimage->drop();
+       crackimage->drop();
+
+       // Create texture from resulting image
 
        video::ITexture *newtexture = driver->addTexture(newname, baseimage);
 
@@ -137,39 +175,45 @@ video::ITexture * CrackTextureMod::make(video::ITexture *original,
        return newtexture;
 }
 
-#if 0
-video::ITexture * createAlphaBlitTexture(const char *name, video::ITexture *base,
-               video::ITexture *other, v2u32 size, v2s32 pos_base, v2s32 pos_other)
+video::ITexture * ProgressBarTextureMod::make(video::ITexture *original,
+               const char *newname, video::IVideoDriver* driver)
 {
-       if(g_device == NULL)
-               return NULL;
-       video::IVideoDriver* driver = g_device->getVideoDriver();
-
-       core::dimension2d<u32> dim(size.X, size.Y);
+       core::position2d<s32> pos_base(0, 0);
+       core::dimension2d<u32> dim = original->getOriginalSize();
 
-       video::IImage *baseimage = driver->createImage(
-                       base,
-                       core::position2d<s32>(pos_base.X, pos_base.Y),
-                       dim);
+       video::IImage *baseimage = driver->createImage(original, pos_base, dim);
        assert(baseimage);
-
-       video::IImage *otherimage = driver->createImage(
-                       other,
-                       core::position2d<s32>(pos_other.X, pos_other.Y),
-                       dim);
-       assert(sourceimage);
        
-       otherimage->copyToWithAlpha(baseimage, v2s32(0,0),
-                       core::rect<s32>(v2s32(0,0), dim),
-                       video::SColor(255,255,255,255),
-                       core::rect<s32>(v2s32(0,0), dim));
-       otherimage->drop();
+       core::dimension2d<u32> size = baseimage->getDimension();
+
+       u32 barheight = 1;
+       u32 barpad_x = 1;
+       u32 barpad_y = 1;
+       u32 barwidth = size.Width - barpad_x*2;
+       v2u32 barpos(barpad_x, size.Height - barheight - barpad_y);
 
-       video::ITexture *newtexture = driver->addTexture(name, baseimage);
+       u32 barvalue_i = (u32)(((float)barwidth * value) + 0.5);
+
+       video::SColor active(255,255,0,0);
+       video::SColor inactive(255,0,0,0);
+       for(u32 x0=0; x0<barwidth; x0++)
+       {
+               video::SColor *c;
+               if(x0 < barvalue_i)
+                       c = &active;
+               else
+                       c = &inactive;
+               u32 x = x0 + barpos.X;
+               for(u32 y=barpos.Y; y<barpos.Y+barheight; y++)
+               {
+                       baseimage->setPixel(x,y, *c);
+               }
+       }
+       
+       video::ITexture *newtexture = driver->addTexture(newname, baseimage);
 
        baseimage->drop();
 
        return newtexture;
 }
-#endif