Added support to GL_TEXTURE_MATRIX on the renderers.

Added Texture::CoordinateType and implemented the support to the TextureFactory::bind.
Some refactor was made.
Text now uses CoordinateType::Pixel.

--HG--
branch : dev-2.1
This commit is contained in:
Martín Lucas Golini
2018-01-18 02:31:53 -03:00
parent 1815b9f6d3
commit 0801d4c23d
27 changed files with 224 additions and 109 deletions

View File

@@ -371,7 +371,7 @@ void EETest::createUI() {
Uint32 UI_MAN_OPS = 0;
if ( mDebugUI )
UI_MAN_OPS = UI_MANAGER_HIGHLIGHT_FOCUS | UI_MANAGER_HIGHLIGHT_OVER | UI_MANAGER_DRAW_DEBUG_DATA | UI_MANAGER_DRAW_BOXES | UI_MANAGER_HIGHLIGHT_INVALIDATION;
UIManager::instance()->init(UI_MAN_OPS | UI_MANAGER_USE_DRAW_INVALIDATION | UI_MANAGER_MAIN_CONTROL_IN_FRAME_BUFFER);
UIManager::instance()->init(UI_MAN_OPS | UI_MANAGER_USE_DRAW_INVALIDATION /*| UI_MANAGER_MAIN_CONTROL_IN_FRAME_BUFFER*/);
UIManager::instance()->setTranslator( mTranslator );
//mTheme = UITheme::loadFromDirectory( UIThemeDefault::New( mThemeName, mThemeName ), MyPath + "ui/" + mThemeName + "/" );
@@ -1214,7 +1214,7 @@ void EETest::loadTextures() {
TNP.resize(12);
for ( i = 0; i <= 6; i++ ) {
TN[i] = TF->loadFromFile( MyPath + "sprites/" + String::toStr(i+1) + ".png", (i+1) == 7 ? true : false, ( (i+1) == 4 ) ? Texture::ClampMode::CLAMP_REPEAT : Texture::ClampMode::CLAMP_TO_EDGE );
TN[i] = TF->loadFromFile( MyPath + "sprites/" + String::toStr(i+1) + ".png", (i+1) == 7 ? true : false, ( (i+1) == 4 ) ? Texture::ClampMode::ClampRepeat : Texture::ClampMode::ClampToEdge );
TNP[i] = TF->getTexture( TN[i] );
}