Changeset 698


Ignore:
Timestamp:
Feb 28, 2011, 3:26:06 AM (10 years ago)
Author:
sam
Message:

Enable GL_TEXTURE_2D in the Scene class instead of Video.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/scene.cpp

    r686 r698  
    168168    glUniform1i(uni_tex, 0);
    169169
     170    glEnable(GL_TEXTURE_2D);
    170171    glEnable(GL_DEPTH_TEST);
    171172    glDepthFunc(GL_LEQUAL);
  • trunk/src/video.cpp

    r686 r698  
    9797    glViewport(0, 0, width, height);
    9898
    99     glEnable(GL_TEXTURE_2D);
     99    glClearColor(0.1f, 0.2f, 0.3f, 0.0f);
     100    glClearDepthf(1.0);
     101
    100102#if defined HAVE_GL_2X || defined HAVE_GLES_1X
    101103    glShadeModel(GL_SMOOTH);
    102104#endif
    103     glClearColor(0.1f, 0.2f, 0.3f, 0.0f);
    104     glClearDepthf(1.0);
    105 
    106105#if defined HAVE_GL_2X || defined HAVE_GLES_1X
    107106    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
Note: See TracChangeset for help on using the changeset viewer.