Changeset 728
- Timestamp:
- Mar 7, 2011, 7:05:40 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/scene.cpp
r705 r728 37 37 extern Shader *stdshader; 38 38 #endif 39 extern mat4 proj_matrix, view_matrix,model_matrix;39 extern mat4 model_matrix; 40 40 41 41 /* … … 178 178 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 179 179 #else 180 //glEnable(GL_DEPTH_TEST); 181 //glDepthFunc(GL_LEQUAL); 182 //glEnable(GL_ALPHA_TEST); 183 //glAlphaFunc(GL_GEQUAL, 0.01f); 184 //glEnable(GL_BLEND); 185 //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 186 187 #if 0 188 /* Reset all model-view-projection matrices */ 189 glMatrixMode(GL_PROJECTION); 190 glPushMatrix(); 191 glLoadIdentity(); 192 glMultMatrixf(&proj_matrix[0][0]); 193 #endif 180 glEnable(GL_DEPTH_TEST); 181 glDepthFunc(GL_LEQUAL); 182 glEnable(GL_ALPHA_TEST); 183 glAlphaFunc(GL_GEQUAL, 0.01f); 184 glEnable(GL_BLEND); 185 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 186 194 187 glMatrixMode(GL_MODELVIEW); 195 188 glPushMatrix(); 196 189 glLoadIdentity(); 197 //glMultMatrixf(&model_matrix[0][0]); 198 glMultMatrixf(&view_matrix[0][0]); 190 glMultMatrixf(&model_matrix[0][0]); 199 191 200 192 /* Set up state machine */ 201 glDisable(GL_DEPTH_TEST);202 193 glEnableClientState(GL_TEXTURE_COORD_ARRAY); 203 194 glEnable(GL_TEXTURE_2D); 204 195 glEnableClientState(GL_VERTEX_ARRAY); 205 glEnable(GL_BLEND);206 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);207 196 #endif 208 197
Note: See TracChangeset
for help on using the changeset viewer.