Changeset 2001Tweet

Timestamp:

Oct 9, 2012, 5:22:37 PM (6 years ago)

Author:

sam

Message:

tutorial: add a new texture generation example.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• src/gpu/shader.h (modified) (1 diff)
• src/gpu/texture.cpp (modified) (8 diffs)
• src/gpu/texture.h (modified) (1 diff)
• tutorial/04_texture.cpp (added)
• tutorial/04_texture.lolfx (added)
• tutorial/04_texture.vcxproj (added)
• tutorial/Makefile.am (modified) (2 diffs)

trunk/.gitignore

@@ -79 +79 @@
 tutorial/02_cube
 tutorial/03_noise
+tutorial/04_texture
 tutorial/05_easymesh
 tutorial/08_fbo

trunk/src/gpu/shader.h

@@ -51 +51 @@
     friend class Shader;
     friend class FrameBuffer;
+    friend class Texture;
 
 public:

trunk/src/gpu/texture.cpp

@@ -46 +46 @@
 
 #if defined USE_D3D9
-    IDirect3DTexture9 *m_tex;
+    IDirect3DTexture9 *m_texture;
 #elif defined _XBOX
-    D3DTexture *m_tex;
-#else
-    GLuint m_texid;
+    D3DTexture *m_texture;
+#else
+    GLuint m_texture;
     GLint m_internal_format;
     GLenum m_gl_format, m_gl_type;
@@ -102 +102 @@
     g_d3ddevice->CreateTexture(m_data->m_size.x, m_data->m_size.y, 1,
                                d3d_usage, d3d_format,
-                               D3DPOOL_DEFAULT, &m_data->m_tex, NULL);
+                               D3DPOOL_DEFAULT, &m_data->m_texture, NULL);
 #else
     static struct
@@ -144 +144 @@
     m_data->m_gl_type = GET_CLAMPED(gl_formats, format).type;
 
-    glGenTextures(1, &m_data->m_texid);
-    glBindTexture(GL_TEXTURE_2D, m_data->m_texid);
+    glGenTextures(1, &m_data->m_texture);
+    glBindTexture(GL_TEXTURE_2D, m_data->m_texture);
 
 #   if defined __CELLOS_LV2__
@@ -158 +158 @@
 }
 
+ShaderTexture Texture::GetTexture() const
+{
+    ShaderTexture ret;
+#if defined USE_D3D9 || defined _XBOX
+    ret.m_flags = (uint64_t)(uintptr_t)m_data->m_texture;
+#else
+    ret.m_flags = m_data->m_texture;
+#endif
+    return ret;
+}
+
 void Texture::Bind()
 {
 #if defined _XBOX || defined USE_D3D9
-    g_d3ddevice->SetTexture(0, m_data->m_tex);
+    g_d3ddevice->SetTexture(0, m_data->m_texture);
 #else
 #   if !defined HAVE_GLES_2X
     glEnable(GL_TEXTURE_2D);
 #   endif
-    glBindTexture(GL_TEXTURE_2D, m_data->m_texid);
+    glBindTexture(GL_TEXTURE_2D, m_data->m_texture);
 #endif
 }
@@ -175 +186 @@
     D3DLOCKED_RECT rect;
 #   if defined USE_D3D9
-    m_data->m_tex->LockRect(0, &rect, NULL, D3DLOCK_DISCARD);
-#   else
-    m_data->m_tex->LockRect(0, &rect, NULL, 0);
+    m_data->m_texture->LockRect(0, &rect, NULL, D3DLOCK_DISCARD);
+#   else
+    m_data->m_texture->LockRect(0, &rect, NULL, 0);
 #   endif
 
     memcpy(rect.pBits, data, rect.Pitch * m_data->m_size.y);
 
-    m_data->m_tex->UnlockRect(0);
+    m_data->m_texture->UnlockRect(0);
 
 #else
@@ -195 +206 @@
 #if defined _XBOX || defined USE_D3D9
     D3DLOCKED_RECT rect;
-    m_data->m_tex->LockRect(0, &rect, NULL, 0);
+    m_data->m_texture->LockRect(0, &rect, NULL, 0);
 
     for (int j = 0; j < size.y; j++)
@@ -205 +216 @@
     }
 
-    m_data->m_tex->UnlockRect(0);
+    m_data->m_texture->UnlockRect(0);
 
 #else
@@ -216 +227 @@
 {
 #if defined USE_D3D9 || defined _XBOX
-    m_data->m_tex->Release();
-#else
-    glDeleteTextures(1, &m_data->m_texid);
+    m_data->m_texture->Release();
+#else
+    glDeleteTextures(1, &m_data->m_texture);
 #endif
 

trunk/src/gpu/texture.h

@@ -47 +47 @@
     void SetSubData(ivec2 origin, ivec2 size, void *data);
 
+    ShaderTexture GetTexture() const;
+
 private:
     class TextureData *m_data;

trunk/tutorial/Makefile.am

@@ -4 +4 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-noinst_PROGRAMS = 01_triangle 02_cube 03_noise 05_easymesh 08_fbo 11_fractal
+noinst_PROGRAMS = 01_triangle 02_cube 03_noise 04_texture 05_easymesh \
+                  08_fbo 11_fractal
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
@@ -21 +22 @@
 03_noise_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
+04_texture_SOURCES = 04_texture.cpp 04_texture.lolfx
+04_texture_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
+04_texture_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+04_texture_DEPENDENCIES = $(top_builddir)/src/liblol.a
+
 05_easymesh_SOURCES = 05_easymesh.cpp
 05_easymesh_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@