Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"isExternalTextureRetina" display default #440

Merged
merged 19 commits into from Aug 18, 2022
Merged

"isExternalTextureRetina" display default #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f576c59
Fumbling toward a transformation on CoronaTotalTime, so far the comma…
ggcrunchy Feb 7, 2019
6626191
Moved some of the time transform stuff into ShaderResource with link …
ggcrunchy Feb 8, 2019
e59f04a
Better argument checking for time transforms
ggcrunchy Feb 9, 2019
e05f972
Whoops, wasn't always linking Program back to ShaderResource
ggcrunchy Feb 10, 2019
c7af750
Removed notes to self about changes
ggcrunchy Feb 11, 2019
9058c1f
timeTransform ignored if no time dependency
ggcrunchy Feb 11, 2019
c01d916
Minor changes
ggcrunchy May 29, 2020
08dc3b6
Maintenance Revert Test
scottrules44 Sep 20, 2021
05b91fb
Simulator: Adding Samsung Galaxy 21 as a skin
scottrules44 Sep 22, 2021
f44be24
Maintenance
scottrules44 Sep 22, 2021
581d844
Android: adding rest of media intents for Android 11
scottrules44 Sep 22, 2021
265be3c
Merge
ggcrunchy Sep 23, 2021
e217c80
Merge
ggcrunchy Oct 4, 2021
ca300c1
Merge branch 'master' of https://github.com/coronalabs/corona
ggcrunchy Oct 19, 2021
0b5e1e9
First go at graphics.undefineEffect()
ggcrunchy Nov 9, 2021
b41e624
Revert "First go at graphics.undefineEffect()"
ggcrunchy Nov 10, 2021
5be6193
Merging upstream
ggcrunchy Aug 18, 2022
f38ecec
Merge branch 'master' of https://github.com/ggcrunchy/corona
ggcrunchy Aug 18, 2022
5d676e3
Added isExternalTextureRetina display default, use by same
ggcrunchy Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion librtt/Display/Rtt_DisplayDefaults.cpp
View file
Open in desktop
Expand Up @@ -47,7 +47,8 @@ DisplayDefaults::DisplayDefaults()
fIsNativeTextBoxFontSizeScaled( true ),
fShaderCompilerVerbose( kShaderCompilerVerboseDefault ),
fIsAnchorClamped( true ),
fIsImageSheetSampledInsideFrame( false )
fIsImageSheetSampledInsideFrame( false ),
fIsExternalTextureRetina( true )
{
}

Expand Down
4 changes: 4 additions & 0 deletions librtt/Display/Rtt_DisplayDefaults.h
View file
Open in desktop
Expand Up @@ -60,6 +60,9 @@ class DisplayDefaults

bool IsImageSheetSampledInsideFrame() const { return fIsImageSheetSampledInsideFrame;}
void SetImageSheetSampledInsideFrame( bool newValue ) { fIsImageSheetSampledInsideFrame = newValue; }

bool IsExternalTextureRetina() const { return fIsExternalTextureRetina;}
void SetExternalTextureRetina( bool newValue ) { fIsExternalTextureRetina = newValue; }
public:
bool IsV1Compatibility() const { return fV1Compatibility; }
void SetV1Compatibility( bool newValue ) { fV1Compatibility = newValue; }
Expand Down Expand Up @@ -96,6 +99,7 @@ class DisplayDefaults
bool fShaderCompilerVerbose;
bool fIsAnchorClamped;
bool fIsImageSheetSampledInsideFrame;
bool fIsExternalTextureRetina;
};

// ----------------------------------------------------------------------------
Expand Down
10 changes: 10 additions & 0 deletions librtt/Display/Rtt_LuaLibDisplay.cpp
View file
Open in desktop
Expand Up @@ -1808,6 +1808,11 @@ DisplayLibrary::getDefault( lua_State *L )
bool value = defaults.IsImageSheetSampledInsideFrame();
lua_pushboolean( L, value ? 1 : 0 );
}
else if ( ( Rtt_StringCompare( key, "isExternalTextureRetina" ) == 0 ) )
{
bool value = defaults.IsExternalTextureRetina();
lua_pushboolean( L, value ? 1 : 0 );
}
else if ( key )
{
luaL_error( L, "ERROR: display.getDefault() given invalid key (%s)", key );
Expand Down Expand Up @@ -1933,6 +1938,11 @@ DisplayLibrary::setDefault( lua_State *L )
bool value = lua_toboolean( L, index ) ? true : false;
defaults.SetImageSheetSampledInsideFrame( value );
}
else if ( ( Rtt_StringCompare( key, "isExternalTextureRetina" ) == 0 ) )
{
bool value = lua_toboolean( L, index ) ? true : false;
defaults.SetExternalTextureRetina( value );
}
else if ( key )
{
luaL_error( L, "ERROR: display.setDefault() given invalid key (%s)", key );
Expand Down
6 changes: 0 additions & 6 deletions librtt/Display/Rtt_LuaLibGraphics.cpp
View file
Open in desktop
Expand Up @@ -78,9 +78,7 @@ class GraphicsLibrary
static int newOutline( lua_State *L ); // This returns an outline in texels.
static int newTexture( lua_State *L );
static int releaseTextures( lua_State *L );
// STEVE CHANGE
static int undefineEffect( lua_State *L );
// /STEVE CHANGE
static int getFontMetrics( lua_State *L );

private:
Expand Down Expand Up @@ -123,9 +121,7 @@ GraphicsLibrary::Open( lua_State *L )
{ "newOutline", newOutline }, // This returns an outline in texels.
{ "newTexture", newTexture },
{ "releaseTextures", releaseTextures },
// STEVE CHANGE
{ "undefineEffect", undefineEffect },
// /STEVE CHANGE
{ "getFontMetrics", getFontMetrics },

{ NULL, NULL }
Expand Down Expand Up @@ -793,7 +789,6 @@ GraphicsLibrary::releaseTextures( lua_State *L )
return result;
}

// STEVE CHANGE
// ----------------------------------------------------------------------------

int
Expand All @@ -810,7 +805,6 @@ GraphicsLibrary::undefineEffect( lua_State *L )

return 1;
}
// /STEVE CHANGE

// ----------------------------------------------------------------------------

Expand Down
4 changes: 3 additions & 1 deletion librtt/Display/Rtt_TextureFactory.cpp
View file
Open in desktop
Expand Up @@ -574,7 +574,9 @@ TextureFactory::FindOrCreateExternal(const std::string &cacheKey,
return fOwnedTextures[cacheKey];
}

TextureResource *resource = TextureResourceExternal::Create( *this, callbacks, context, true );
bool isRetina = GetDisplay().GetDefaults().IsExternalTextureRetina();

TextureResource *resource = TextureResourceExternal::Create( *this, callbacks, context, isRetina );
SharedPtr< TextureResource > result = SharedPtr< TextureResource >( resource );

fCache[cacheKey] = CacheEntry( result );
Expand Down