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

fix android compile error

This commit is contained in:
patricejiang 2019-03-12 16:50:47 +08:00 committed by Arnold
parent 62c6eae7c3
commit 58c40c1cc6
No known key found for this signature in database
GPG Key ID: 2008D1CC4BD1AE60
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/3d/CCSprite3D.cpp
View File

@ -34,6 +34,7 @@
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "base/CCAsyncTaskPool.h" #include "base/CCAsyncTaskPool.h"
#include "base/ccUTF8.h" #include "base/ccUTF8.h"
#include "base/ccUtils.h"
#include "2d/CCLight.h" #include "2d/CCLight.h"
#include "2d/CCCamera.h" #include "2d/CCCamera.h"
#include "base/ccMacros.h" #include "base/ccMacros.h"

9
cocos/renderer/CCTexture2D.h
View File

@ -300,8 +300,10 @@ public:
//TODO: minggo: is it resaonable? //TODO: minggo: is it resaonable?
bool initWithBackendTexture(backend::Texture* texture); bool initWithBackendTexture(backend::Texture* texture);
/** Set sampler properties
*/
void setSamplerDescriptor(const backend::SamplerDescriptor& texParams);
//TODO: should be remove later
void setTexParameters(const TexParams &params); void setTexParameters(const TexParams &params);
/** Generates mipmap images for the texture. /** Generates mipmap images for the texture.
@ -403,11 +405,6 @@ private:
std::unordered_map<SpriteFrame*, Rect> capInsetMap; std::unordered_map<SpriteFrame*, Rect> capInsetMap;
}; };
/** Set sampler properties
*/
void setSamplerDescriptor(const backend::SamplerDescriptor& texParams);
/** /**
* Whether the texture contains a 9-patch capInset info or not. * Whether the texture contains a 9-patch capInset info or not.
* *

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

@ -2157,10 +2157,10 @@ void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
_textureCube->retain(); _textureCube->retain();
//set texture parameters //set texture parameters
Texture2D::TexParams tRepeatParams; Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = GL_LINEAR; tRepeatParams.magFilter = backend::SamplerFilter::LINEAR;
tRepeatParams.minFilter = GL_LINEAR; tRepeatParams.minFilter = backend::SamplerFilter::LINEAR;
tRepeatParams.wrapS = GL_CLAMP_TO_EDGE; tRepeatParams.wrapS = backend::SamplerAddressMode::CLAMP_TO_EDGE;
tRepeatParams.wrapT = GL_CLAMP_TO_EDGE; tRepeatParams.wrapT = backend::SamplerAddressMode::CLAMP_TO_EDGE;
_textureCube->setTexParameters(tRepeatParams); _textureCube->setTexParameters(tRepeatParams);
auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/CubeMap.material"); auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/CubeMap.material");

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit 30b0386b0ed6ee762d7f6570547c4d639fb12f92 Subproject commit 4c2c3e63f6a00242b2bd67ab930237b7478f27d1