Menu
▾
▴
[Hgengine-cvs] SF.net SVN: hgengine:[48] Mercury2/src
|
From: <axl...@us...> - 2008-12-05 12:22:16
|
Revision: 48
http://hgengine.svn.sourceforge.net/hgengine/?rev=48&view=rev
Author: axlecrusher
Date: 2008-12-05 11:51:29 +0000 (Fri, 05 Dec 2008)
Log Message:
-----------
Quick and dirty texture
Modified Paths:
--------------
Mercury2/src/MercuryAsset.h
Mercury2/src/MercuryUtil.h
Mercury2/src/Quad.cpp
Mercury2/src/Viewport.cpp
Added Paths:
-----------
Mercury2/src/Texture.cpp
Mercury2/src/Texture.h
Modified: Mercury2/src/MercuryAsset.h
===================================================================
--- Mercury2/src/MercuryAsset.h 2008-12-05 11:49:09 UTC (rev 47)
+++ Mercury2/src/MercuryAsset.h 2008-12-05 11:51:29 UTC (rev 48)
@@ -13,7 +13,7 @@
virtual void Render(MercuryNode* node) = 0;
virtual void PostRender(MercuryNode* node) {};
- ///Loads a node from an XMLNode representing itself
+ ///Loads an asset from an XMLAsset representing itself
virtual void LoadFromXML(const XMLNode& node) {};
};
Modified: Mercury2/src/MercuryUtil.h
===================================================================
--- Mercury2/src/MercuryUtil.h 2008-12-05 11:49:09 UTC (rev 47)
+++ Mercury2/src/MercuryUtil.h 2008-12-05 11:51:29 UTC (rev 48)
@@ -10,6 +10,8 @@
#define SAFE_DELETE( x ) { if (x) { delete x; } x = NULL; }
#define SAFE_DELETE_ARRAY( x ) { if (x) { delete[] x; } x = NULL; }
+#define TO_ENDIAN( x )
+
#if defined(__GNUC__)
#define M_ALIGN(n) __attribute__((aligned(n)))
#else
Modified: Mercury2/src/Quad.cpp
===================================================================
--- Mercury2/src/Quad.cpp 2008-12-05 11:49:09 UTC (rev 47)
+++ Mercury2/src/Quad.cpp 2008-12-05 11:51:29 UTC (rev 48)
@@ -6,10 +6,18 @@
void Quad::Render(MercuryNode* node)
{
glBegin(GL_QUADS);
+ glTexCoord2f(0,0);
glVertex3f(-0.5f, -0.5f, 0.0f);
+
+ glTexCoord2f(1,0);
glVertex3f( 0.5f, -0.5f, 0.0f);
+
+ glTexCoord2f(1,1);
glVertex3f( 0.5f, 0.5f, 0.0f);
+
+ glTexCoord2f(0,1);
glVertex3f(-0.5f, 0.5f, 0.0f);
+
glEnd();
}
Added: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp (rev 0)
+++ Mercury2/src/Texture.cpp 2008-12-05 11:51:29 UTC (rev 48)
@@ -0,0 +1,244 @@
+#include <Texture.h>
+#include <GL/gl.h>
+
+using namespace std;
+
+REGISTER_ASSET_TYPE(Texture);
+
+RawImageData* LoadBMP( const string& filename )
+{
+ int offset;
+ char* tmp = new char[sizeof(int)];
+ int compression = 0;
+ int length;
+ int rawlength = 0;
+ int bitsapix = 0;
+ unsigned char b[3];
+ unsigned int res_x, res_y;
+
+ FILE* file = fopen(filename.c_str(), "rb");
+ printf( "BMP Load Start\n" );
+ if (file==NULL)
+ {
+ printf("Could not open BMP (null file pointer)\n");
+ SAFE_DELETE_ARRAY(tmp);
+ return NULL;
+ }
+
+ //Get the type of file and test
+ memset(tmp, 0, 4);
+// file->Read(tmp, sizeof(char) * 2);
+ fread(tmp, sizeof(char) * 2, 1, file);
+ string type(tmp);
+
+ if (type != "BM")
+ {
+ printf("not a valid BMP\n");
+ SAFE_DELETE_ARRAY(tmp);
+ return NULL;
+ }
+ //Offset of bitmap data.
+ fseek(file, 10, SEEK_SET);
+// file->Seek(10);
+ fread(tmp, 4, 1, file);
+// file->Read(tmp, 4);
+ memcpy(&offset, tmp, 4);
+ TO_ENDIAN( offset );
+
+ RawImageData* image = new RawImageData;
+
+ //width & width
+ fseek(file, 18, SEEK_SET);
+// file->Seek(18);
+ fread(tmp, sizeof(int), 1, file);
+// file->Read(tmp, sizeof(int));
+ memcpy(&image->m_width, tmp, sizeof(int));
+ TO_ENDIAN( image->m_width );
+ fread(tmp, sizeof(int), 1, file);
+// file->Read(tmp, sizeof(int));
+ memcpy(&image->m_height, tmp, sizeof(int));
+ TO_ENDIAN( image->m_height );
+
+ //bits per pixel
+ memset(tmp, 0, sizeof(int));
+ fseek(file, 28, SEEK_SET);
+// file->Seek(28);
+// file->Read(tmp, sizeof(int));
+ fread(tmp, sizeof(int), 1, file);
+ memcpy(&bitsapix, tmp, sizeof(int));
+ TO_ENDIAN( bitsapix );
+
+ if (bitsapix != 24)
+ {
+ printf("is not 24b/pix\n");
+ SAFE_DELETE_ARRAY(tmp);
+ SAFE_DELETE_ARRAY(image);
+ return NULL;
+ }
+
+ //compression
+// file->Seek(30);
+ fseek(file, 30, SEEK_SET);
+// file->Read(tmp, sizeof(int));
+ fread(tmp, sizeof(int), 1, file);
+ memcpy(&compression, tmp, sizeof(int));
+ TO_ENDIAN(compression);
+
+ if (compression != 0)
+ {
+ printf("uses compression (not supported)\n");
+ SAFE_DELETE_ARRAY(tmp);
+ SAFE_DELETE_ARRAY(image);
+ return NULL;
+ }
+
+ //pix/m X
+ memset(tmp, 0, sizeof(int));
+// file->Seek(38);
+ fseek(file, 38, SEEK_SET);
+// file->Read(tmp, sizeof(int));
+ fread(tmp, sizeof(int), 1, file);
+ memcpy(&res_x, tmp, sizeof(int));
+ TO_ENDIAN(res_x);
+
+ //pix/m Y
+ memset(tmp, 0, sizeof(int));
+ fseek(file, 42, SEEK_SET);
+// file->Seek(42);
+// file->Read(tmp, sizeof(int));
+ fread(tmp, sizeof(int), 1, file);
+ memcpy(&res_y, tmp, sizeof(int));
+ TO_ENDIAN(res_y);
+
+ if (res_x > 0)
+ {
+// image->attrs.m_dpi_x = M2DPI(res_x);
+ }
+
+ if (res_y > 0)
+ {
+// image->attrs.m_dpi_y = M2DPI(res_y);
+ }
+
+ //Get the file length
+// length = file->Length();
+ fseek(file,0,SEEK_END);
+ length = ftell(file);
+ rawlength = (length) - (offset-1); //Remember to subtract 1 from the offset.
+
+ //Allocate space
+ SAFE_DELETE_ARRAY(image->m_data);
+ image->m_data = new unsigned char[rawlength];
+
+ memset(image->m_data, 0, rawlength);
+
+ //Get raw data and convert BGR->RGB
+// file->Seek(offset);
+ fseek(file, offset, SEEK_SET);
+// for (unsigned int x = 0; !file->Eof(); x += 3)
+ for (unsigned int x = 0; !feof(file); x += 3)
+ {
+ memset(b, 0, sizeof(unsigned char) * 3);
+// file->Read((char*)&b, sizeof(unsigned char) * 3);
+ fread(&b, sizeof(unsigned char) * 3, 1, file);
+
+ image->m_data[x] = b[2];
+ image->m_data[x+1] = b[1];
+ image->m_data[x+2] = b[0];
+ }
+// image->attrs.m_ColorByteType = RGB;
+ SAFE_DELETE_ARRAY(tmp);
+ printf( "BMP Load End\n" );
+// RID = image;
+ return image;
+}
+
+
+RawImageData::RawImageData()
+ :m_data(NULL)
+{
+}
+
+RawImageData::~RawImageData()
+{
+ SAFE_DELETE_ARRAY(m_data);
+}
+
+Texture::Texture()
+ :m_raw(NULL),m_textureID(0)
+{
+ glEnable( GL_TEXTURE_2D );
+}
+
+Texture::~Texture()
+{
+ if (m_textureID) glDeleteTextures(1, &m_textureID);
+ m_textureID = 0;
+
+ SAFE_DELETE(m_raw);
+}
+
+void Texture::LoadFromRaw(const RawImageData* raw)
+{
+ if ( !m_textureID ) glGenTextures(1, &m_textureID);
+
+ m_raw = raw;
+
+ glBindTexture(GL_TEXTURE_2D, m_textureID);
+ glTexImage2D(GL_TEXTURE_2D,
+ 0,
+ 3,
+ m_raw->m_width,
+ m_raw->m_height,
+ 0,
+ GL_RGB,
+ GL_UNSIGNED_BYTE,
+ m_raw->m_data);
+
+ glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+
+ glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+
+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+};
+
+void Texture::Render(MercuryNode* node)
+{
+ glEnable( GL_TEXTURE_2D );
+ glBindTexture(GL_TEXTURE_2D, m_textureID);
+}
+
+void Texture::LoadFromXML(const XMLNode& node)
+{
+ if ( !node.Attribute("imagefile").empty() )
+ {
+ RawImageData* d = LoadBMP( node.Attribute("imagefile") );
+ if (d) LoadFromRaw( d );
+ }
+}
+
+/***************************************************************************
+ * Copyright (C) 2008 by Joshua Allen *
+ * *
+ * *
+ * All rights reserved. *
+ * *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: *
+ * * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. *
+ * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. *
+ * * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. *
+ * *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR *
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
+ ***************************************************************************/
Added: Mercury2/src/Texture.h
===================================================================
--- Mercury2/src/Texture.h (rev 0)
+++ Mercury2/src/Texture.h 2008-12-05 11:51:29 UTC (rev 48)
@@ -0,0 +1,55 @@
+#include <MercuryAsset.h>
+
+class RawImageData
+{
+ public:
+ RawImageData();
+ ~RawImageData();
+
+ unsigned int m_width;
+ unsigned int m_height;
+ unsigned short m_bits;
+ unsigned char* m_data;
+};
+
+class Texture : public MercuryAsset
+{
+ public:
+ Texture();
+ virtual ~Texture();
+
+ virtual void PreRender(MercuryNode* node) {};
+ virtual void Render(MercuryNode* node);
+ virtual void PostRender(MercuryNode* node) {};
+
+ virtual void LoadFromXML(const XMLNode& node);
+
+ void LoadFromRaw(const RawImageData* raw);
+ private:
+ const RawImageData* m_raw;
+ unsigned int m_textureID;
+};
+
+/***************************************************************************
+ * Copyright (C) 2008 by Joshua Allen *
+ * *
+ * *
+ * All rights reserved. *
+ * *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: *
+ * * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. *
+ * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. *
+ * * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. *
+ * *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR *
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
+ ***************************************************************************/
Modified: Mercury2/src/Viewport.cpp
===================================================================
--- Mercury2/src/Viewport.cpp 2008-12-05 11:49:09 UTC (rev 47)
+++ Mercury2/src/Viewport.cpp 2008-12-05 11:51:29 UTC (rev 48)
@@ -1,6 +1,5 @@
#include <Viewport.h>
#include <GL/gl.h>
-//#include <GL/glut.h>
REGISTER_NODE_TYPE(Viewport);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
