Fix the error of dynamic material scane.

This commit is contained in:
caryliu
2019-07-08 20:04:40 +08:00
parent 43ae9f9f5a
commit 34cb81ca5b
10 changed files with 131 additions and 140 deletions
@@ -223,14 +223,14 @@ void BaseRenderer::setProperty (Effect::Property& prop)
{
if (0 != prop.getCount())
{
if (Technique::Parameter::Type::COLOR3 == propType ||
Technique::Parameter::Type::INT3 == propType ||
Technique::Parameter::Type::FLOAT3 == propType ||
Technique::Parameter::Type::MAT3 == propType)
{
RENDERER_LOGW("Uinform array of color3/int3/float3/mat3 can not be supported!");
return;
}
// if (Technique::Parameter::Type::COLOR3 == propType ||
// Technique::Parameter::Type::INT3 == propType ||
// Technique::Parameter::Type::FLOAT3 == propType ||
// Technique::Parameter::Type::MAT3 == propType)
// {
// RENDERER_LOGW("Uinform array of color3/int3/float3/mat3 can not be supported!");
// return;
// }
uint8_t size = Technique::Parameter::getElements(propType);
if (size * prop.getCount() > 64)
@@ -54,12 +54,10 @@ ForwardRenderer::~ForwardRenderer()
_spotLights.clear();
_shadowLights.clear();
_ambientLights.clear();
_defines.clear();
delete _arrayPool;
_arrayPool = nullptr;
delete _defines;
_defines = nullptr;
}
bool ForwardRenderer::init(DeviceGraphics* device, std::vector<ProgramLib::Template>& programTemplates, Texture2D* defaultTexture, int width, int height)
@@ -82,6 +80,7 @@ void ForwardRenderer::resetData()
void ForwardRenderer::render(Scene* scene)
{
resetData();
updateLights(scene);
scene->sortCameras();
auto& cameras = scene->getCameras();
for (auto camera : cameras)
@@ -157,11 +156,11 @@ void ForwardRenderer::updateLights(Scene* scene)
void ForwardRenderer::updateDefines()
{
_defines->emplace(std::make_pair("_NUM_DIR_LIGHTS", std::min(4, (int)_directionalLights.size())));
_defines->emplace(std::make_pair("_NUM_POINT_LIGHTS", std::min(4, (int)_pointLights.size())));
_defines->emplace(std::make_pair("_NUM_SPOT_LIGHTS", std::min(4, (int)_spotLights.size())));
_defines->emplace(std::make_pair("_NUM_AMBIENT_LIGHTS", std::min(4, (int)_ambientLights.size())));
_defines->emplace(std::make_pair("CC_NUM_SHADOW_LIGHTS", std::min(4, (int)_shadowLights.size())));
_defines.emplace(std::make_pair("_NUM_DIR_LIGHTS", std::min(4, (int)_directionalLights.size())));
_defines.emplace(std::make_pair("_NUM_POINT_LIGHTS", std::min(4, (int)_pointLights.size())));
_defines.emplace(std::make_pair("_NUM_SPOT_LIGHTS", std::min(4, (int)_spotLights.size())));
_defines.emplace(std::make_pair("_NUM_AMBIENT_LIGHTS", std::min(4, (int)_ambientLights.size())));
_defines.emplace(std::make_pair("CC_NUM_SHADOW_LIGHTS", std::min(4, (int)_shadowLights.size())));
}
void ForwardRenderer::submitLightsUniforms()
@@ -279,7 +278,7 @@ void ForwardRenderer::submitShadowStageUniforms(const View& view)
static float* shadowInfo = new float[4];
shadowInfo[0] = view.shadowLight->getShadowMinDepth();
shadowInfo[1] = view.shadowLight->getShadowMaxDepth();
shadowInfo[2] = view.shadowLight->getShadowScale();
shadowInfo[2] = view.shadowLight->getShadowDepthScale();
shadowInfo[3] = view.shadowLight->getShadowDarkness();
_device->setUniformMat4("cc_shadow_map_lightViewProjMatrix", view.matViewProj);
@@ -302,7 +301,7 @@ void ForwardRenderer::submitOtherStagesUniforms()
*(shadowLightInfo + index) = light->getShadowMinDepth();
*(shadowLightInfo + index + 1) = light->getShadowMaxDepth();
*(shadowLightInfo + index + 2) = light->getShadowScale();
*(shadowLightInfo + index + 2) = light->getShadowDepthScale();
*(shadowLightInfo + index + 3) = light->getShadowDarkness();
}
@@ -312,7 +311,18 @@ void ForwardRenderer::submitOtherStagesUniforms()
void ForwardRenderer::updateShaderDefines(StageItem& item)
{
item.defines = _defines;
for (auto& e : _defines)
{
const std::string& key = e.first;
if(item.defines->count(key) == 0)
{
item.defines->emplace(key, e.second);
}
else
{
item.defines->find(key)->second = e.second;
}
}
}
bool ForwardRenderer::compareItems(const StageItem &a, const StageItem &b)
@@ -85,7 +85,7 @@ private:
Vector<Light*> _ambientLights;
RecyclePool<float>* _arrayPool = nullptr;
ValueMap* _defines = nullptr;
ValueMap _defines;
int _width = 0;
int _height = 0;
+7 -3
View File
@@ -223,11 +223,11 @@ public:
/**
* @brief Sets the shadow scale.
*/
inline void setShadowScale(float val) { _shadowScale = val; }
inline void setShadowDepthScale(float val) { _shadowScale = val; }
/**
* @brief Gets the shadow scale.
*/
inline float getShadowScale() const { return _shadowScale; }
inline float getShadowDepthScale() const { return _shadowScale; }
/**
* @brief Sets the frustum edge fall off.
*/
@@ -252,6 +252,10 @@ public:
* @brief Update light and generate new shadow map.
*/
void update(DeviceGraphics* device);
/**
* @brief Sets the shadow frustum size.
*/
inline void setShadowFrustumSize(uint32_t val) {_shadowFustumSize = val;};
private:
void updateLightPositionAndDirection();
@@ -291,7 +295,7 @@ private:
uint32_t _frustumEdgeFalloff = 0; // used by directional and spot light.
Mat4 _viewProjMatrix;
float _spotAngleScale = 1; // used for spot light.
uint32_t _shadowFustumSize = 80; // used for directional light.
uint32_t _shadowFustumSize = 50; // used for directional light.
Mat4 _worldMatrix;
Mat4 _worldRT;
+1 -5
View File
@@ -142,11 +142,7 @@ void Model::reset()
CC_SAFE_RELEASE_NULL(_effect);
CC_SAFE_RELEASE_NULL(_node);
_inputAssembler.clear();
if (_defines != nullptr)
{
delete _defines;
_defines = nullptr;
}
_defines = nullptr;
_uniforms.clear();
}
@@ -88,18 +88,6 @@ array
*/
renderer.CustomProperties = {
/**
* @method setProperty
* @param {String} arg0
* @param {cc.renderer::Technique::Parameter} arg1
*/
setProperty : function (
str,
parameter
)
{
},
/**
* @method define
* @param {String} arg0
@@ -958,16 +946,6 @@ ForwardRenderer : function (
*/
renderer.Light = {
/**
* @method getShadowScale
* @return {float}
*/
getShadowScale : function (
)
{
return 0;
},
/**
* @method getRange
* @return {float}
@@ -978,6 +956,16 @@ getRange : function (
return 0;
},
/**
* @method setShadowFrustumSize
* @param {unsigned int} arg0
*/
setShadowFrustumSize : function (
int
)
{
},
/**
* @method setShadowResolution
* @param {unsigned int} arg0
@@ -1098,6 +1086,16 @@ getSpotExp : function (
return 0;
},
/**
* @method setShadowDepthScale
* @param {float} arg0
*/
setShadowDepthScale : function (
float
)
{
},
/**
* @method getViewPorjMatrix
* @return {mat4_object}
@@ -1258,16 +1256,6 @@ float
{
},
/**
* @method setShadowScale
* @param {float} arg0
*/
setShadowScale : function (
float
)
{
},
/**
* @method setColor
* @param {float} arg0
@@ -1312,6 +1300,16 @@ getShadowResolution : function (
return 0;
},
/**
* @method getShadowDepthScale
* @return {float}
*/
getShadowDepthScale : function (
)
{
return 0;
},
/**
* @method getShadowType
* @return {cc.renderer::Light::ShadowType}
@@ -161,27 +161,6 @@ bool js_register_renderer_ProgramLib(se::Object* obj)
se::Object* __jsb_cocos2d_renderer_CustomProperties_proto = nullptr;
se::Class* __jsb_cocos2d_renderer_CustomProperties_class = nullptr;
static bool js_renderer_CustomProperties_setProperty(se::State& s)
{
cocos2d::renderer::CustomProperties* cobj = (cocos2d::renderer::CustomProperties*)s.nativeThisObject();
SE_PRECONDITION2(cobj, false, "js_renderer_CustomProperties_setProperty : Invalid Native Object");
const auto& args = s.args();
size_t argc = args.size();
CC_UNUSED bool ok = true;
if (argc == 2) {
std::string arg0;
cocos2d::renderer::Technique::Parameter arg1;
ok &= seval_to_std_string(args[0], &arg0);
ok &= seval_to_TechniqueParameter(args[1], &arg1);
SE_PRECONDITION2(ok, false, "js_renderer_CustomProperties_setProperty : Error processing arguments");
cobj->setProperty(arg0, arg1);
return true;
}
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2);
return false;
}
SE_BIND_FUNC(js_renderer_CustomProperties_setProperty)
static bool js_renderer_CustomProperties_define(se::State& s)
{
cocos2d::renderer::CustomProperties* cobj = (cocos2d::renderer::CustomProperties*)s.nativeThisObject();
@@ -235,7 +214,6 @@ bool js_register_renderer_CustomProperties(se::Object* obj)
{
auto cls = se::Class::create("CustomProperties", obj, nullptr, _SE(js_renderer_CustomProperties_constructor));
cls->defineFunction("setProperty", _SE(js_renderer_CustomProperties_setProperty));
cls->defineFunction("define", _SE(js_renderer_CustomProperties_define));
cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_CustomProperties_finalize));
cls->install();
@@ -2459,24 +2437,6 @@ bool js_register_renderer_ForwardRenderer(se::Object* obj)
se::Object* __jsb_cocos2d_renderer_Light_proto = nullptr;
se::Class* __jsb_cocos2d_renderer_Light_class = nullptr;
static bool js_renderer_Light_getShadowScale(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
SE_PRECONDITION2(cobj, false, "js_renderer_Light_getShadowScale : Invalid Native Object");
const auto& args = s.args();
size_t argc = args.size();
CC_UNUSED bool ok = true;
if (argc == 0) {
float result = cobj->getShadowScale();
ok &= float_to_seval(result, &s.rval());
SE_PRECONDITION2(ok, false, "js_renderer_Light_getShadowScale : Error processing arguments");
return true;
}
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0);
return false;
}
SE_BIND_FUNC(js_renderer_Light_getShadowScale)
static bool js_renderer_Light_getRange(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
@@ -2495,6 +2455,25 @@ static bool js_renderer_Light_getRange(se::State& s)
}
SE_BIND_FUNC(js_renderer_Light_getRange)
static bool js_renderer_Light_setShadowFrustumSize(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
SE_PRECONDITION2(cobj, false, "js_renderer_Light_setShadowFrustumSize : Invalid Native Object");
const auto& args = s.args();
size_t argc = args.size();
CC_UNUSED bool ok = true;
if (argc == 1) {
unsigned int arg0 = 0;
ok &= seval_to_uint32(args[0], (uint32_t*)&arg0);
SE_PRECONDITION2(ok, false, "js_renderer_Light_setShadowFrustumSize : Error processing arguments");
cobj->setShadowFrustumSize(arg0);
return true;
}
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1);
return false;
}
SE_BIND_FUNC(js_renderer_Light_setShadowFrustumSize)
static bool js_renderer_Light_setShadowResolution(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
@@ -2715,6 +2694,25 @@ static bool js_renderer_Light_getSpotExp(se::State& s)
}
SE_BIND_FUNC(js_renderer_Light_getSpotExp)
static bool js_renderer_Light_setShadowDepthScale(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
SE_PRECONDITION2(cobj, false, "js_renderer_Light_setShadowDepthScale : Invalid Native Object");
const auto& args = s.args();
size_t argc = args.size();
CC_UNUSED bool ok = true;
if (argc == 1) {
float arg0 = 0;
ok &= seval_to_float(args[0], &arg0);
SE_PRECONDITION2(ok, false, "js_renderer_Light_setShadowDepthScale : Error processing arguments");
cobj->setShadowDepthScale(arg0);
return true;
}
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1);
return false;
}
SE_BIND_FUNC(js_renderer_Light_setShadowDepthScale)
static bool js_renderer_Light_getViewPorjMatrix(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
@@ -3010,25 +3008,6 @@ static bool js_renderer_Light_setRange(se::State& s)
}
SE_BIND_FUNC(js_renderer_Light_setRange)
static bool js_renderer_Light_setShadowScale(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
SE_PRECONDITION2(cobj, false, "js_renderer_Light_setShadowScale : Invalid Native Object");
const auto& args = s.args();
size_t argc = args.size();
CC_UNUSED bool ok = true;
if (argc == 1) {
float arg0 = 0;
ok &= seval_to_float(args[0], &arg0);
SE_PRECONDITION2(ok, false, "js_renderer_Light_setShadowScale : Error processing arguments");
cobj->setShadowScale(arg0);
return true;
}
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1);
return false;
}
SE_BIND_FUNC(js_renderer_Light_setShadowScale)
static bool js_renderer_Light_setColor(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
@@ -3108,6 +3087,24 @@ static bool js_renderer_Light_getShadowResolution(se::State& s)
}
SE_BIND_FUNC(js_renderer_Light_getShadowResolution)
static bool js_renderer_Light_getShadowDepthScale(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
SE_PRECONDITION2(cobj, false, "js_renderer_Light_getShadowDepthScale : Invalid Native Object");
const auto& args = s.args();
size_t argc = args.size();
CC_UNUSED bool ok = true;
if (argc == 0) {
float result = cobj->getShadowDepthScale();
ok &= float_to_seval(result, &s.rval());
SE_PRECONDITION2(ok, false, "js_renderer_Light_getShadowDepthScale : Error processing arguments");
return true;
}
SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0);
return false;
}
SE_BIND_FUNC(js_renderer_Light_getShadowDepthScale)
static bool js_renderer_Light_getShadowType(se::State& s)
{
cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject();
@@ -3171,8 +3168,8 @@ bool js_register_renderer_Light(se::Object* obj)
{
auto cls = se::Class::create("Light", obj, nullptr, _SE(js_renderer_Light_constructor));
cls->defineFunction("getShadowScale", _SE(js_renderer_Light_getShadowScale));
cls->defineFunction("getRange", _SE(js_renderer_Light_getRange));
cls->defineFunction("setShadowFrustumSize", _SE(js_renderer_Light_setShadowFrustumSize));
cls->defineFunction("setShadowResolution", _SE(js_renderer_Light_setShadowResolution));
cls->defineFunction("getFrustumEdgeFalloff", _SE(js_renderer_Light_getFrustumEdgeFalloff));
cls->defineFunction("setSpotExp", _SE(js_renderer_Light_setSpotExp));
@@ -3185,6 +3182,7 @@ bool js_register_renderer_Light(se::Object* obj)
cls->defineFunction("getSpotAngle", _SE(js_renderer_Light_getSpotAngle));
cls->defineFunction("getDirectionUniform", _SE(js_renderer_Light_getDirectionUniform));
cls->defineFunction("getSpotExp", _SE(js_renderer_Light_getSpotExp));
cls->defineFunction("setShadowDepthScale", _SE(js_renderer_Light_setShadowDepthScale));
cls->defineFunction("getViewPorjMatrix", _SE(js_renderer_Light_getViewPorjMatrix));
cls->defineFunction("getType", _SE(js_renderer_Light_getType));
cls->defineFunction("getColorUniform", _SE(js_renderer_Light_getColorUniform));
@@ -3201,11 +3199,11 @@ bool js_register_renderer_Light(se::Object* obj)
cls->defineFunction("setWorldMatrix", _SE(js_renderer_Light_setWorldMatrix));
cls->defineFunction("setSpotAngle", _SE(js_renderer_Light_setSpotAngle));
cls->defineFunction("setRange", _SE(js_renderer_Light_setRange));
cls->defineFunction("setShadowScale", _SE(js_renderer_Light_setShadowScale));
cls->defineFunction("setColor", _SE(js_renderer_Light_setColor));
cls->defineFunction("setShadowMaxDepth", _SE(js_renderer_Light_setShadowMaxDepth));
cls->defineFunction("setFrustumEdgeFalloff", _SE(js_renderer_Light_setFrustumEdgeFalloff));
cls->defineFunction("getShadowResolution", _SE(js_renderer_Light_getShadowResolution));
cls->defineFunction("getShadowDepthScale", _SE(js_renderer_Light_getShadowDepthScale));
cls->defineFunction("getShadowType", _SE(js_renderer_Light_getShadowType));
cls->defineFunction("setShadowBias", _SE(js_renderer_Light_setShadowBias));
cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Light_finalize));
@@ -20,7 +20,6 @@ extern se::Class* __jsb_cocos2d_renderer_CustomProperties_class;
bool js_register_cocos2d_renderer_CustomProperties(se::Object* obj);
bool register_all_renderer(se::Object* obj);
SE_DECLARE_FUNC(js_renderer_CustomProperties_setProperty);
SE_DECLARE_FUNC(js_renderer_CustomProperties_define);
SE_DECLARE_FUNC(js_renderer_CustomProperties_CustomProperties);
@@ -158,8 +157,8 @@ extern se::Class* __jsb_cocos2d_renderer_Light_class;
bool js_register_cocos2d_renderer_Light(se::Object* obj);
bool register_all_renderer(se::Object* obj);
SE_DECLARE_FUNC(js_renderer_Light_getShadowScale);
SE_DECLARE_FUNC(js_renderer_Light_getRange);
SE_DECLARE_FUNC(js_renderer_Light_setShadowFrustumSize);
SE_DECLARE_FUNC(js_renderer_Light_setShadowResolution);
SE_DECLARE_FUNC(js_renderer_Light_getFrustumEdgeFalloff);
SE_DECLARE_FUNC(js_renderer_Light_setSpotExp);
@@ -172,6 +171,7 @@ SE_DECLARE_FUNC(js_renderer_Light_getShadowDarkness);
SE_DECLARE_FUNC(js_renderer_Light_getSpotAngle);
SE_DECLARE_FUNC(js_renderer_Light_getDirectionUniform);
SE_DECLARE_FUNC(js_renderer_Light_getSpotExp);
SE_DECLARE_FUNC(js_renderer_Light_setShadowDepthScale);
SE_DECLARE_FUNC(js_renderer_Light_getViewPorjMatrix);
SE_DECLARE_FUNC(js_renderer_Light_getType);
SE_DECLARE_FUNC(js_renderer_Light_getColorUniform);
@@ -188,11 +188,11 @@ SE_DECLARE_FUNC(js_renderer_Light_setShadowDarkness);
SE_DECLARE_FUNC(js_renderer_Light_setWorldMatrix);
SE_DECLARE_FUNC(js_renderer_Light_setSpotAngle);
SE_DECLARE_FUNC(js_renderer_Light_setRange);
SE_DECLARE_FUNC(js_renderer_Light_setShadowScale);
SE_DECLARE_FUNC(js_renderer_Light_setColor);
SE_DECLARE_FUNC(js_renderer_Light_setShadowMaxDepth);
SE_DECLARE_FUNC(js_renderer_Light_setFrustumEdgeFalloff);
SE_DECLARE_FUNC(js_renderer_Light_getShadowResolution);
SE_DECLARE_FUNC(js_renderer_Light_getShadowDepthScale);
SE_DECLARE_FUNC(js_renderer_Light_getShadowType);
SE_DECLARE_FUNC(js_renderer_Light_setShadowBias);
SE_DECLARE_FUNC(js_renderer_Light_Light);
@@ -574,21 +574,6 @@ static bool js_renderer_CustomProperties_setProperty(se::State& s)
}
SE_BIND_FUNC(js_renderer_CustomProperties_setProperty);
static bool js_renderer_CustomProperties_define(se::State& s)
{
cocos2d::renderer::CustomProperties* cobj = (cocos2d::renderer::CustomProperties*)s.nativeThisObject();
CC_UNUSED bool ok = true;
const auto& args = s.args();
std::string arg0;
cocos2d::Value arg1;
ok &= seval_to_std_string(args[0], &arg0);
ok &= seval_to_ccvalue(args[1], &arg1);
SE_PRECONDITION2(ok, false, "js_renderer_CustomProperties_setProperty : Error processing arguments");
cobj->define(arg0, arg1);
return true;
}
SE_BIND_FUNC(js_renderer_CustomProperties_define);
bool jsb_register_renderer_manual(se::Object* global)
{
// Get the ns
+1 -1
View File
@@ -59,7 +59,7 @@ skip = RenderFlow::[calculateWorldMatrix insertNodeLevel visit calculateLocalMa
Technique::[setPass getParameters getPasses getStageIDs copy],
MemPool::[getCommonPool getCommonUnit getCommonList],
NodeMemPool::[getUnit getNodePool getInstance],
CustomProperties::[extractProperties extractDefines getHash getDefine getProperty]
CustomProperties::[extractProperties extractDefines getHash getDefine getProperty setProperty]
rename_classes = BaseRenderer::Base,
Effect::EffectNative,
Pass::PassNative