Changeset 704
- Timestamp:
- Feb 28, 2011, 3:26:27 AM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/debugquad.cpp
r703 r704 52 52 { 53 53 data->initialised = 0; 54 data->time = 0.0f;54 data->time = RandF(10000.0f); 55 55 56 56 drawgroup = DRAWGROUP_HUD; … … 115 115 glGenTextures(1, data->texlist); 116 116 117 gl ActiveTexture(GL_TEXTURE0);117 glEnable(GL_TEXTURE_2D); 118 118 glBindTexture(GL_TEXTURE_2D, data->texlist[0]); 119 119 for (int j = 0; j < 32; j++) … … 179 179 180 180 /* Bind texture */ 181 gl ActiveTexture(GL_TEXTURE0);181 glClientActiveTexture(GL_TEXTURE0); 182 182 glBindTexture(GL_TEXTURE_2D, data->texlist[0]); 183 183 … … 218 218 219 219 /* Bind texture */ 220 gl ActiveTexture(GL_TEXTURE0);220 glClientActiveTexture(GL_TEXTURE0); 221 221 glBindTexture(GL_TEXTURE_2D, data->texlist[0]); 222 222 -
trunk/src/tileset.cpp
r689 r704 137 137 138 138 glGenTextures(1, &data->texture); 139 glEnable(GL_TEXTURE_2D); 139 140 glBindTexture(GL_TEXTURE_2D, data->texture); 140 141 141 glTexImage2D(GL_TEXTURE_2D, 0, planes, w, h, 0,142 glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0, 142 143 format, GL_UNSIGNED_BYTE, pixels); 143 144 … … 170 171 { 171 172 if (!data->img && data->texture) 173 { 174 glClientActiveTexture(GL_TEXTURE0); 172 175 glBindTexture(GL_TEXTURE_2D, data->texture); 176 } 173 177 } 174 178
Note: See TracChangeset
for help on using the changeset viewer.