Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

alias backend::SamplerDescriptor

This commit is contained in:
Arnold 2019-03-13 10:54:26 +08:00
parent 53975ee428
commit 1d0107c087
No known key found for this signature in database
GPG Key ID: 2008D1CC4BD1AE60
11 changed files with 54 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCCameraBackgroundBrush.cpp
View File

@ -320,8 +320,8 @@ CameraBackgroundSkyBoxBrush* CameraBackgroundSkyBoxBrush::create(
Texture2D::TexParams tRepeatParams; Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = backend::SamplerFilter::LINEAR; tRepeatParams.magFilter = backend::SamplerFilter::LINEAR;
tRepeatParams.minFilter = backend::SamplerFilter::LINEAR; tRepeatParams.minFilter = backend::SamplerFilter::LINEAR;
tRepeatParams.wrapS = backend::SamplerAddressMode::CLAMP_TO_EDGE; tRepeatParams.sAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
tRepeatParams.wrapT = backend::SamplerAddressMode::CLAMP_TO_EDGE; tRepeatParams.tAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
texture->setTexParameters(tRepeatParams); texture->setTexParameters(tRepeatParams);
ret = new (std::nothrow) CameraBackgroundSkyBoxBrush; ret = new (std::nothrow) CameraBackgroundSkyBoxBrush;

16
cocos/3d/CCSprite3D.cpp
View File

@ -392,8 +392,8 @@ Sprite3D* Sprite3D::createSprite3DNode(NodeData* nodedata,ModelData* modeldata,c
Texture2D::TexParams texParams; Texture2D::TexParams texParams;
texParams.minFilter = backend::SamplerFilter::LINEAR; texParams.minFilter = backend::SamplerFilter::LINEAR;
texParams.magFilter = backend::SamplerFilter::LINEAR; texParams.magFilter = backend::SamplerFilter::LINEAR;
texParams.wrapS = utils::toBackendAddressMode(textureData->wrapS); texParams.sAddressMode = utils::toBackendAddressMode(textureData->wrapS);
texParams.wrapT = utils::toBackendAddressMode(textureData->wrapT); texParams.tAddressMode = utils::toBackendAddressMode(textureData->wrapT);
tex->setTexParameters(texParams); tex->setTexParameters(texParams);
mesh->_isTransparent = (materialData->getTextureData(NTextureData::Usage::Transparency) != nullptr); mesh->_isTransparent = (materialData->getTextureData(NTextureData::Usage::Transparency) != nullptr);
} }
@ -407,8 +407,8 @@ Sprite3D* Sprite3D::createSprite3DNode(NodeData* nodedata,ModelData* modeldata,c
Texture2D::TexParams texParams; Texture2D::TexParams texParams;
texParams.minFilter = backend::SamplerFilter::LINEAR; texParams.minFilter = backend::SamplerFilter::LINEAR;
texParams.magFilter = backend::SamplerFilter::LINEAR; texParams.magFilter = backend::SamplerFilter::LINEAR;
texParams.wrapS = utils::toBackendAddressMode(textureData->wrapS); texParams.sAddressMode = utils::toBackendAddressMode(textureData->wrapS);
texParams.wrapT = utils::toBackendAddressMode(textureData->wrapT); texParams.tAddressMode = utils::toBackendAddressMode(textureData->wrapT);
tex->setTexParameters(texParams); tex->setTexParameters(texParams);
} }
mesh->setTexture(tex, NTextureData::Usage::Normal); mesh->setTexture(tex, NTextureData::Usage::Normal);
@ -557,8 +557,8 @@ void Sprite3D::createNode(NodeData* nodedata, Node* root, const MaterialDatas& m
Texture2D::TexParams texParams; Texture2D::TexParams texParams;
texParams.minFilter = backend::SamplerFilter::LINEAR; texParams.minFilter = backend::SamplerFilter::LINEAR;
texParams.magFilter = backend::SamplerFilter::LINEAR; texParams.magFilter = backend::SamplerFilter::LINEAR;
texParams.wrapS = utils::toBackendAddressMode(textureData->wrapS); texParams.sAddressMode = utils::toBackendAddressMode(textureData->wrapS);
texParams.wrapT = utils::toBackendAddressMode(textureData->wrapT); texParams.tAddressMode = utils::toBackendAddressMode(textureData->wrapT);
tex->setTexParameters(texParams); tex->setTexParameters(texParams);
mesh->_isTransparent = (materialData->getTextureData(NTextureData::Usage::Transparency) != nullptr); mesh->_isTransparent = (materialData->getTextureData(NTextureData::Usage::Transparency) != nullptr);
} }
@ -572,8 +572,8 @@ void Sprite3D::createNode(NodeData* nodedata, Node* root, const MaterialDatas& m
Texture2D::TexParams texParams; Texture2D::TexParams texParams;
texParams.minFilter = backend::SamplerFilter::LINEAR; texParams.minFilter = backend::SamplerFilter::LINEAR;
texParams.magFilter = backend::SamplerFilter::LINEAR; texParams.magFilter = backend::SamplerFilter::LINEAR;
texParams.wrapS = utils::toBackendAddressMode(textureData->wrapS); texParams.sAddressMode = utils::toBackendAddressMode(textureData->wrapS);
texParams.wrapT = utils::toBackendAddressMode(textureData->wrapT); texParams.tAddressMode = utils::toBackendAddressMode(textureData->wrapT);
tex->setTexParameters(texParams); tex->setTexParameters(texParams);
} }
mesh->setTexture(tex, NTextureData::Usage::Normal); mesh->setTexture(tex, NTextureData::Usage::Normal);

16
cocos/3d/CCTerrain.cpp
View File

@ -91,8 +91,8 @@ void cocos2d::Terrain::setLightMap(const std::string& fileName)
Texture2D::TexParams tRepeatParams;//set texture parameters Texture2D::TexParams tRepeatParams;//set texture parameters
tRepeatParams.magFilter = tRepeatParams.minFilter = backend::SamplerFilter::LINEAR; tRepeatParams.magFilter = tRepeatParams.minFilter = backend::SamplerFilter::LINEAR;
tRepeatParams.wrapS = backend::SamplerAddressMode::REPEAT; tRepeatParams.sAddressMode = backend::SamplerAddressMode::REPEAT;
tRepeatParams.wrapT = backend::SamplerAddressMode::REPEAT; tRepeatParams.tAddressMode = backend::SamplerAddressMode::REPEAT;
_lightMap->setTexParameters(tRepeatParams); _lightMap->setTexParameters(tRepeatParams);
} }
@ -824,8 +824,8 @@ bool Terrain::initTextures()
} }
Texture2D::TexParams texParam; Texture2D::TexParams texParam;
texParam.wrapS = backend::SamplerAddressMode::REPEAT; texParam.sAddressMode = backend::SamplerAddressMode::REPEAT;
texParam.wrapT = backend::SamplerAddressMode::REPEAT; texParam.tAddressMode = backend::SamplerAddressMode::REPEAT;
if (_terrainData._alphaMapSrc.empty()) if (_terrainData._alphaMapSrc.empty())
{ {
auto textImage = new (std::nothrow)Image(); auto textImage = new (std::nothrow)Image();
@ -846,8 +846,8 @@ bool Terrain::initTextures()
image->initWithImageFile(_terrainData._alphaMapSrc); image->initWithImageFile(_terrainData._alphaMapSrc);
_alphaMap = new (std::nothrow)Texture2D(); _alphaMap = new (std::nothrow)Texture2D();
_alphaMap->initWithImage(image); _alphaMap->initWithImage(image);
texParam.wrapS = backend::SamplerAddressMode::CLAMP_TO_EDGE; texParam.sAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
texParam.wrapT = backend::SamplerAddressMode::CLAMP_TO_EDGE; texParam.tAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
texParam.minFilter = backend::SamplerFilter::LINEAR; texParam.minFilter = backend::SamplerFilter::LINEAR;
texParam.magFilter = backend::SamplerFilter::LINEAR; texParam.magFilter = backend::SamplerFilter::LINEAR;
_alphaMap->setTexParameters(texParam); _alphaMap->setTexParameters(texParam);
@ -863,8 +863,8 @@ bool Terrain::initTextures()
texture->generateMipmap(); texture->generateMipmap();
_detailMapTextures[i] = texture; _detailMapTextures[i] = texture;
texParam.wrapS = backend::SamplerAddressMode::REPEAT; texParam.sAddressMode = backend::SamplerAddressMode::REPEAT;
texParam.wrapT = backend::SamplerAddressMode::REPEAT; texParam.tAddressMode = backend::SamplerAddressMode::REPEAT;
texParam.minFilter = backend::SamplerFilter::LINEAR; texParam.minFilter = backend::SamplerFilter::LINEAR;
texParam.magFilter = backend::SamplerFilter::LINEAR; texParam.magFilter = backend::SamplerFilter::LINEAR;
texture->setTexParameters(texParam); texture->setTexParameters(texParam);

8
cocos/renderer/CCMaterial.cpp
View File

@ -253,9 +253,9 @@ bool Material::parseSampler(backend::ProgramState* programState, Properties* sam
// valid options: REPEAT, CLAMP // valid options: REPEAT, CLAMP
const char* wrapS = getOptionalString(samplerProperties, "wrapS", "CLAMP_TO_EDGE"); const char* wrapS = getOptionalString(samplerProperties, "wrapS", "CLAMP_TO_EDGE");
if (strcasecmp(wrapS, "REPEAT")==0) if (strcasecmp(wrapS, "REPEAT")==0)
texParams.wrapS = backend::SamplerAddressMode::REPEAT; texParams.sAddressMode = backend::SamplerAddressMode::REPEAT;
else if(strcasecmp(wrapS, "CLAMP_TO_EDGE")==0) else if(strcasecmp(wrapS, "CLAMP_TO_EDGE")==0)
texParams.wrapS = backend::SamplerAddressMode::CLAMP_TO_EDGE; texParams.sAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
else else
CCLOG("Invalid wrapS: %s", wrapS); CCLOG("Invalid wrapS: %s", wrapS);
@ -263,9 +263,9 @@ bool Material::parseSampler(backend::ProgramState* programState, Properties* sam
// valid options: REPEAT, CLAMP // valid options: REPEAT, CLAMP
const char* wrapT = getOptionalString(samplerProperties, "wrapT", "CLAMP_TO_EDGE"); const char* wrapT = getOptionalString(samplerProperties, "wrapT", "CLAMP_TO_EDGE");
if (strcasecmp(wrapT, "REPEAT")==0) if (strcasecmp(wrapT, "REPEAT")==0)
texParams.wrapT = backend::SamplerAddressMode::REPEAT; texParams.tAddressMode = backend::SamplerAddressMode::REPEAT;
else if(strcasecmp(wrapT, "CLAMP_TO_EDGE")==0) else if(strcasecmp(wrapT, "CLAMP_TO_EDGE")==0)
texParams.wrapT = backend::SamplerAddressMode::CLAMP_TO_EDGE; texParams.tAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
else else
CCLOG("Invalid wrapT: %s", wrapT); CCLOG("Invalid wrapT: %s", wrapT);

14
cocos/renderer/CCTexture2D.cpp
View File

@ -908,19 +908,7 @@ Texture2D* Texture2D::getAlphaTexture() const
return _alphaTexture; return _alphaTexture;
} }
void Texture2D::setTexParameters(const Texture2D::TexParams &params) void Texture2D::setTexParameters(const Texture2D::TexParams &desc)
{
backend::SamplerDescriptor sd;
sd.mipmapEnabled = true;
sd.mipmapFilter = backend::SamplerFilter::DONT_CARE;
sd.minFilter = params.minFilter;
sd.magFilter = params.magFilter;
sd.sAddressMode = params.wrapS;
sd.tAddressMode = params.wrapT;
_texture->updateSamplerDescriptor(sd);
}
void Texture2D::setTexParameters(const backend::SamplerDescriptor &desc)
{ {
_texture->updateSamplerDescriptor(desc); _texture->updateSamplerDescriptor(desc);
} }

25
cocos/renderer/CCTexture2D.h
View File

@ -25,8 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CCTEXTURE2D_H__ #pragma once
#define __CCTEXTURE2D_H__
#include <string> #include <string>
#include <map> #include <map>
@ -153,23 +152,9 @@ public:
typedef std::map<Texture2D::PixelFormat, const PixelFormatInfo> PixelFormatInfoMap; typedef std::map<Texture2D::PixelFormat, const PixelFormatInfo> PixelFormatInfoMap;
/** /**
Extension to set the Min / Mag filter * Extension to set the Min / Mag filter
*/ */
struct TexParams { using TexParams = backend::SamplerDescriptor;
backend::SamplerFilter minFilter;
backend::SamplerFilter magFilter;
backend::SamplerAddressMode wrapS;
backend::SamplerAddressMode wrapT;
bool mipmapEnabled = true;
backend::SamplerFilter mipmapFilter = backend::SamplerFilter::LINEAR;
TexParams(backend::SamplerFilter _minFilter, backend::SamplerFilter _magFilter,
backend::SamplerAddressMode _wrapS, backend::SamplerAddressMode _wrapT)
:minFilter(_minFilter), magFilter(_magFilter), wrapS(_wrapS), wrapT(_wrapT)
{}
TexParams() = default;
};
public: public:
/** sets the default pixel format for UIImagescontains alpha channel. /** sets the default pixel format for UIImagescontains alpha channel.
@ -311,7 +296,6 @@ public:
void setTexParameters(const TexParams &params); void setTexParameters(const TexParams &params);
void setTexParameters(const backend::SamplerDescriptor &desc);
/** Generates mipmap images for the texture. /** Generates mipmap images for the texture.
It only works if the texture size is POT (power of 2). It only works if the texture size is POT (power of 2).
@ -495,6 +479,3 @@ protected:
/// @} /// @}
NS_CC_END NS_CC_END
#endif //__CCTEXTURE2D_H__

9
cocos/renderer/CCTextureCube.cpp
View File

@ -292,14 +292,7 @@ bool TextureCube::init(const std::string& positive_x, const std::string& negativ
void TextureCube::setTexParameters(const Texture2D::TexParams& texParams) void TextureCube::setTexParameters(const Texture2D::TexParams& texParams)
{ {
backend::SamplerDescriptor samplerDescriptor; _texture->updateSamplerDescriptor(texParams);
samplerDescriptor.mipmapEnabled = true;
samplerDescriptor.mipmapFilter = backend::SamplerFilter::LINEAR;
samplerDescriptor.minFilter = texParams.minFilter;
samplerDescriptor.magFilter = texParams.magFilter;
samplerDescriptor.tAddressMode = texParams.wrapT;
samplerDescriptor.sAddressMode = texParams.wrapS;
_texture->updateSamplerDescriptor(samplerDescriptor);
} }
bool TextureCube::reloadTexture() bool TextureCube::reloadTexture()

25
cocos/renderer/backend/Types.h
View File

@ -188,21 +188,32 @@ enum class ColorWriteMask: uint32_t
struct SamplerDescriptor struct SamplerDescriptor
{ {
bool mipmapEnabled = false; bool mipmapEnabled = true;
SamplerFilter magFilter = SamplerFilter::LINEAR; SamplerFilter magFilter = SamplerFilter::LINEAR;
SamplerFilter minFilter = SamplerFilter::LINEAR; SamplerFilter minFilter = SamplerFilter::LINEAR;
SamplerFilter mipmapFilter = SamplerFilter::LINEAR; SamplerFilter mipmapFilter = SamplerFilter::LINEAR;
SamplerAddressMode sAddressMode = SamplerAddressMode::CLAMP_TO_EDGE; SamplerAddressMode sAddressMode = SamplerAddressMode::CLAMP_TO_EDGE;
SamplerAddressMode tAddressMode = SamplerAddressMode::CLAMP_TO_EDGE; SamplerAddressMode tAddressMode = SamplerAddressMode::CLAMP_TO_EDGE;
SamplerDescriptor(bool _mipmapEnabled = false, SamplerDescriptor() {}
SamplerFilter _magFilter = SamplerFilter::LINEAR,
SamplerFilter _minFilter = SamplerFilter::LINEAR, SamplerDescriptor(
SamplerFilter _mipmapFilter = SamplerFilter::LINEAR, SamplerFilter _magFilter,
SamplerAddressMode _sAddressMode = SamplerAddressMode::CLAMP_TO_EDGE, SamplerFilter _minFilter,
SamplerAddressMode _tAddressMode = SamplerAddressMode::CLAMP_TO_EDGE SamplerAddressMode _sAddressMode,
SamplerAddressMode _tAddressMode
) : magFilter(_magFilter), minFilter(_minFilter),
sAddressMode(_sAddressMode), tAddressMode(_tAddressMode) {}
SamplerDescriptor(bool _mipmapEnabled,
SamplerFilter _magFilter,
SamplerFilter _minFilter,
SamplerFilter _mipmapFilter,
SamplerAddressMode _sAddressMode,
SamplerAddressMode _tAddressMode
) :mipmapEnabled(_mipmapEnabled), magFilter(_magFilter), minFilter(_minFilter), ) :mipmapEnabled(_mipmapEnabled), magFilter(_magFilter), minFilter(_minFilter),
mipmapFilter(_mipmapFilter), sAddressMode(_sAddressMode), tAddressMode(_tAddressMode) {} mipmapFilter(_mipmapFilter), sAddressMode(_sAddressMode), tAddressMode(_tAddressMode) {}
}; };
enum class CullMode: uint32_t enum class CullMode: uint32_t

4
cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp
View File

@ -3178,10 +3178,10 @@ void texParams_to_luaval(lua_State* L, const cocos2d::Texture2D::TexParams& inVa
lua_pushnumber(L, (lua_Number) inValue.magFilter); /* L: table key value*/ lua_pushnumber(L, (lua_Number) inValue.magFilter); /* L: table key value*/
lua_rawset(L, -3); lua_rawset(L, -3);
lua_pushstring(L, "wrapS"); /* L: table key */ lua_pushstring(L, "wrapS"); /* L: table key */
lua_pushnumber(L, (lua_Number) inValue.wrapS); /* L: table key value*/ lua_pushnumber(L, (lua_Number) inValue.sAddressMode); /* L: table key value*/
lua_rawset(L, -3); lua_rawset(L, -3);
lua_pushstring(L, "wrapT"); /* L: table key */ lua_pushstring(L, "wrapT"); /* L: table key */
lua_pushnumber(L, (lua_Number) inValue.wrapT); /* L: table key value*/ lua_pushnumber(L, (lua_Number) inValue.tAddressMode); /* L: table key value*/
lua_rawset(L, -3); lua_rawset(L, -3);
} }

4
tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp
View File

@ -395,8 +395,8 @@ void Scene3DTestScene::createWorld3D()
Texture2D::TexParams tRepeatParams; Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = GL_LINEAR; tRepeatParams.magFilter = GL_LINEAR;
tRepeatParams.minFilter = GL_LINEAR; tRepeatParams.minFilter = GL_LINEAR;
tRepeatParams.wrapS = GL_MIRRORED_REPEAT; tRepeatParams.sAddressMode = GL_MIRRORED_REPEAT;
tRepeatParams.wrapT = GL_MIRRORED_REPEAT; tRepeatParams.tAddressMode = GL_MIRRORED_REPEAT;
_textureCube->setTexParameters(tRepeatParams); _textureCube->setTexParameters(tRepeatParams);
// pass the texture sampler to our custom shader // pass the texture sampler to our custom shader

4
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -2113,8 +2113,8 @@ void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
Texture2D::TexParams tRepeatParams; Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = backend::SamplerFilter::LINEAR; tRepeatParams.magFilter = backend::SamplerFilter::LINEAR;
tRepeatParams.minFilter = backend::SamplerFilter::LINEAR; tRepeatParams.minFilter = backend::SamplerFilter::LINEAR;
tRepeatParams.wrapS = backend::SamplerAddressMode::CLAMP_TO_EDGE; tRepeatParams.sAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
tRepeatParams.wrapT = backend::SamplerAddressMode::CLAMP_TO_EDGE; tRepeatParams.tAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
_textureCube->setTexParameters(tRepeatParams); _textureCube->setTexParameters(tRepeatParams);