mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
fix TextureCube todo (#4156)
This commit is contained in:
@@ -31,6 +31,8 @@
|
||||
#include "cocos/math/Vec2.h"
|
||||
#include "cocos/math/Vec3.h"
|
||||
#include "core/ArrayBuffer.h"
|
||||
#include "core/assets/ImageAsset.h"
|
||||
#include "core/assets/TextureCube.h"
|
||||
#include "core/geometry/AABB.h"
|
||||
#include "extensions/cocos-ext.h"
|
||||
#include "network/Downloader.h"
|
||||
@@ -78,7 +80,7 @@ set_member_field(se::Object *obj, T *to, const std::string &property, F f, se::V
|
||||
return true;
|
||||
}
|
||||
|
||||
template <typename A, typename T, typename F>
|
||||
template <typename T, typename F>
|
||||
typename std::enable_if<std::is_member_object_pointer<F>::value, bool>::type
|
||||
set_member_field(se::Object *obj, T *to, const std::string &property, F f, se::Value &tmp) { // NOLINT
|
||||
bool ok = obj->getProperty(property.data(), &tmp, true);
|
||||
@@ -481,10 +483,10 @@ bool sevalue_to_native(const se::Value &from, cc::Vec4 *to, se::Object * /*unuse
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Vec4 failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<float>(obj, to, "x", &cc::Vec4::x, tmp);
|
||||
set_member_field<float>(obj, to, "y", &cc::Vec4::y, tmp);
|
||||
set_member_field<float>(obj, to, "z", &cc::Vec4::z, tmp);
|
||||
set_member_field<float>(obj, to, "w", &cc::Vec4::w, tmp);
|
||||
set_member_field(obj, to, "x", &cc::Vec4::x, tmp);
|
||||
set_member_field(obj, to, "y", &cc::Vec4::y, tmp);
|
||||
set_member_field(obj, to, "z", &cc::Vec4::z, tmp);
|
||||
set_member_field(obj, to, "w", &cc::Vec4::w, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -579,9 +581,9 @@ bool sevalue_to_native(const se::Value &from, cc::Vec3 *to, se::Object * /*unuse
|
||||
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<float>(obj, to, "x", &cc::Vec3::x, tmp);
|
||||
set_member_field<float>(obj, to, "y", &cc::Vec3::y, tmp);
|
||||
set_member_field<float>(obj, to, "z", &cc::Vec3::z, tmp);
|
||||
set_member_field(obj, to, "x", &cc::Vec3::x, tmp);
|
||||
set_member_field(obj, to, "y", &cc::Vec3::y, tmp);
|
||||
set_member_field(obj, to, "z", &cc::Vec3::z, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -591,10 +593,10 @@ bool sevalue_to_native(const se::Value &from, cc::Color *to, se::Object * /*unus
|
||||
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value t;
|
||||
set_member_field<uint8_t>(obj, to, "r", &cc::Color::r, t);
|
||||
set_member_field<uint8_t>(obj, to, "g", &cc::Color::g, t);
|
||||
set_member_field<uint8_t>(obj, to, "b", &cc::Color::b, t);
|
||||
set_member_field<uint8_t>(obj, to, "a", &cc::Color::a, t);
|
||||
set_member_field(obj, to, "r", &cc::Color::r, t);
|
||||
set_member_field(obj, to, "g", &cc::Color::g, t);
|
||||
set_member_field(obj, to, "b", &cc::Color::b, t);
|
||||
set_member_field(obj, to, "a", &cc::Color::a, t);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -604,8 +606,8 @@ bool sevalue_to_native(const se::Value &from, cc::Vec2 *to, se::Object * /*unuse
|
||||
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<float>(obj, to, "x", &cc::Vec2::x, tmp);
|
||||
set_member_field<float>(obj, to, "y", &cc::Vec2::y, tmp);
|
||||
set_member_field(obj, to, "x", &cc::Vec2::x, tmp);
|
||||
set_member_field(obj, to, "y", &cc::Vec2::y, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -615,8 +617,8 @@ bool sevalue_to_native(const se::Value &from, cc::Size *to, se::Object * /*unuse
|
||||
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<float>(obj, to, "width", &cc::Size::width, tmp);
|
||||
set_member_field<float>(obj, to, "height", &cc::Size::height, tmp);
|
||||
set_member_field(obj, to, "width", &cc::Size::width, tmp);
|
||||
set_member_field(obj, to, "height", &cc::Size::height, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -625,10 +627,10 @@ bool sevalue_to_native(const se::Value &from, cc::Quaternion *to, se::Object * /
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Quaternion failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<float>(obj, to, "x", &cc::Quaternion::x, tmp);
|
||||
set_member_field<float>(obj, to, "y", &cc::Quaternion::y, tmp);
|
||||
set_member_field<float>(obj, to, "z", &cc::Quaternion::z, tmp);
|
||||
set_member_field<float>(obj, to, "w", &cc::Quaternion::w, tmp);
|
||||
set_member_field(obj, to, "x", &cc::Quaternion::x, tmp);
|
||||
set_member_field(obj, to, "y", &cc::Quaternion::y, tmp);
|
||||
set_member_field(obj, to, "z", &cc::Quaternion::z, tmp);
|
||||
set_member_field(obj, to, "w", &cc::Quaternion::w, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -639,8 +641,8 @@ bool sevalue_to_native(const se::Value &from, cc::geometry::AABB *to, se::Object
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to AABB failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<cc::Vec3>(obj, to, "halfExtents", &cc::geometry::AABB::halfExtents, tmp);
|
||||
set_member_field<cc::Vec3>(obj, to, "center", &cc::geometry::AABB::center, tmp);
|
||||
set_member_field(obj, to, "halfExtents", &cc::geometry::AABB::halfExtents, tmp);
|
||||
set_member_field(obj, to, "center", &cc::geometry::AABB::center, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -649,9 +651,9 @@ bool sevalue_to_native(const se::Value &from, cc::geometry::Capsule *to, se::Obj
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Capsule failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<float>(obj, to, "radius", &cc::geometry::Capsule::radius, tmp);
|
||||
set_member_field<float>(obj, to, "halfHeight", &cc::geometry::Capsule::halfHeight, tmp);
|
||||
set_member_field<cc::geometry::Capsule::CenterEnum>(obj, to, "axis", &cc::geometry::Capsule::axis, tmp);
|
||||
set_member_field(obj, to, "radius", &cc::geometry::Capsule::radius, tmp);
|
||||
set_member_field(obj, to, "halfHeight", &cc::geometry::Capsule::halfHeight, tmp);
|
||||
set_member_field(obj, to, "axis", &cc::geometry::Capsule::axis, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -660,8 +662,8 @@ bool sevalue_to_native(const se::Value &from, cc::geometry::Line *to, se::Object
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Line failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<cc::Vec3>(obj, to, "s", &cc::geometry::Line::s, tmp);
|
||||
set_member_field<cc::Vec3>(obj, to, "e", &cc::geometry::Line::e, tmp);
|
||||
set_member_field(obj, to, "s", &cc::geometry::Line::s, tmp);
|
||||
set_member_field(obj, to, "e", &cc::geometry::Line::e, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -670,8 +672,8 @@ bool sevalue_to_native(const se::Value &from, cc::geometry::Ray *to, se::Object
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Sphere failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<cc::Vec3>(obj, to, "o", &cc::geometry::Ray::o, tmp);
|
||||
set_member_field<cc::Vec3>(obj, to, "d", &cc::geometry::Ray::d, tmp);
|
||||
set_member_field(obj, to, "o", &cc::geometry::Ray::o, tmp);
|
||||
set_member_field(obj, to, "d", &cc::geometry::Ray::d, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -690,9 +692,9 @@ bool sevalue_to_native(const se::Value &from, cc::geometry::Triangle *to, se::Ob
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Plane failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<cc::Vec3>(obj, to, "a", &cc::geometry::Triangle::a, tmp);
|
||||
set_member_field<cc::Vec3>(obj, to, "b", &cc::geometry::Triangle::b, tmp);
|
||||
set_member_field<cc::Vec3>(obj, to, "c", &cc::geometry::Triangle::c, tmp);
|
||||
set_member_field(obj, to, "a", &cc::geometry::Triangle::a, tmp);
|
||||
set_member_field(obj, to, "b", &cc::geometry::Triangle::b, tmp);
|
||||
set_member_field(obj, to, "c", &cc::geometry::Triangle::c, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -701,8 +703,8 @@ bool sevalue_to_native(const se::Value &from, cc::geometry::Plane *to, se::Objec
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Plane failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<cc::Vec3>(obj, to, "n", &cc::geometry::Plane::n, tmp);
|
||||
set_member_field<float>(obj, to, "d", &cc::geometry::Plane::d, tmp);
|
||||
set_member_field(obj, to, "n", &cc::geometry::Plane::n, tmp);
|
||||
set_member_field(obj, to, "d", &cc::geometry::Plane::d, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -716,8 +718,8 @@ bool sevalue_to_native(const se::Value &from, cc::geometry::Frustum *to, se::Obj
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to Frustum failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<std::array<cc::geometry::Plane, 6>>(obj, to, "planes", &cc::geometry::Frustum::planes, tmp);
|
||||
set_member_field<std::array<cc::Vec3, 8>>(obj, to, "vertices", &cc::geometry::Frustum::vertices, tmp);
|
||||
set_member_field(obj, to, "planes", &cc::geometry::Frustum::planes, tmp);
|
||||
set_member_field(obj, to, "vertices", &cc::geometry::Frustum::vertices, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -767,25 +769,120 @@ bool sevalue_to_native(const se::Value &from, cc::scene::ShadowsInfo *to, se::Ob
|
||||
return true;
|
||||
}
|
||||
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::ImageAsset *to, se::Object * /*unused*/) {
|
||||
se::Object *obj = from.toObject();
|
||||
|
||||
void *privateData = obj->getPrivateData();
|
||||
|
||||
if (privateData) {
|
||||
assert(false); // not copyable
|
||||
return false;
|
||||
}
|
||||
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to ImageAsset failed!");
|
||||
|
||||
se::Value tmp;
|
||||
set_member_field<uint32_t>(obj, to, "width", &cc::ImageAsset::setWidth, tmp);
|
||||
set_member_field<uint32_t>(obj, to, "height", &cc::ImageAsset::setHeight, tmp);
|
||||
|
||||
bool ok = obj->getProperty("format", &tmp, true);
|
||||
if (ok) {
|
||||
to->setFormat(static_cast<cc::PixelFormat>(tmp.toInt32()));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::ImageAsset **to, se::Object *ctx) {
|
||||
se::Object *obj = from.toObject();
|
||||
void * privateData = obj->getPrivateData();
|
||||
|
||||
if (privateData) {
|
||||
*to = static_cast<cc::ImageAsset *>(privateData);
|
||||
return true;
|
||||
}
|
||||
return sevalue_to_native(from, *to, ctx);
|
||||
}
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::ITextureCubeMipmap *to, se::Object * /*unused*/) {
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field(obj, to, "front", &cc::ITextureCubeMipmap::front, tmp);
|
||||
set_member_field(obj, to, "back", &cc::ITextureCubeMipmap::back, tmp);
|
||||
set_member_field(obj, to, "left", &cc::ITextureCubeMipmap::left, tmp);
|
||||
set_member_field(obj, to, "right", &cc::ITextureCubeMipmap::right, tmp);
|
||||
set_member_field(obj, to, "top", &cc::ITextureCubeMipmap::top, tmp);
|
||||
set_member_field(obj, to, "bottom", &cc::ITextureCubeMipmap::bottom, tmp);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, std::vector<cc::ITextureCubeMipmap> *to, se::Object * /*ctx*/) {
|
||||
if (from.isNullOrUndefined()) {
|
||||
to->clear();
|
||||
return true;
|
||||
}
|
||||
|
||||
SE_PRECONDITION2(from.isObject(), false, "sevalue_to_native(std::vector<cc::ITextureCubeMipmap>), not an object");
|
||||
auto *fromObj = from.toObject();
|
||||
CC_ASSERT(fromObj->isArray());
|
||||
uint32_t len = 0;
|
||||
bool ok = fromObj->getArrayLength(&len);
|
||||
if (ok) {
|
||||
to->resize(len);
|
||||
se::Value arrElement;
|
||||
for (uint32_t i = 0; i < len; ++i) {
|
||||
ok = fromObj->getArrayElement(i, &arrElement);
|
||||
if (!ok || !arrElement.isObject()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
sevalue_to_native(arrElement, &to->at(i), nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::TextureCube *to, se::Object * /*unused*/) {
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to TextureCube failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
set_member_field<cc::ITextureCubeMipmap>(obj, to, "image", &cc::TextureCube::setImage, tmp);
|
||||
set_member_field<std::vector<cc::ITextureCubeMipmap>>(obj, to, "mipmaps", &cc::TextureCube::setMipmaps, tmp);
|
||||
return true;
|
||||
}
|
||||
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::TextureCube **to, se::Object *ctx) {
|
||||
return sevalue_to_native(from, *to, ctx);
|
||||
}
|
||||
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::scene::SkyboxInfo *to, se::Object * /*ctx*/) {
|
||||
SE_PRECONDITION2(from.isObject(), false, "Convert parameter to ShadowInfo failed!");
|
||||
se::Object *obj = from.toObject();
|
||||
se::Value tmp;
|
||||
// TODO(PatriceJiang): export TextureCube
|
||||
// set_member_field<cc::TextureCube*>(obj, to, "envmap", &cc::scene::SkyboxInfo::setEnvmap, tmp);
|
||||
set_member_field<cc::TextureCube *>(obj, to, "envmap", &cc::scene::SkyboxInfo::setEnvmap, tmp);
|
||||
set_member_field<cc::TextureCube *>(obj, to, "diffuseMap", &cc::scene::SkyboxInfo::setDiffuseMap, tmp);
|
||||
set_member_field<bool>(obj, to, "enabled", &cc::scene::SkyboxInfo::setEnabled, tmp);
|
||||
set_member_field<bool>(obj, to, "useIBL", &cc::scene::SkyboxInfo::setUseIBL, tmp);
|
||||
set_member_field<bool>(obj, to, "useHDR", &cc::scene::SkyboxInfo::setUseHDR, tmp);
|
||||
set_member_field<bool>(obj, to, "applyDiffuseMap", &cc::scene::SkyboxInfo::setApplyDiffuseMap, tmp);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// cc::variant<int32_t, float, bool, std::string>;
|
||||
// cc::variant<int32_t, bool, std::string>;
|
||||
// NOLINTNEXTLINE(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::MacroValue *to, se::Object * /*ctx*/) {
|
||||
if (from.isBoolean()) {
|
||||
*to = from.toBoolean();
|
||||
} else if (from.isNumber()) {
|
||||
*to = from.toInt32();// NOTE: We only support macro with int32_t type now.
|
||||
*to = from.toInt32(); // NOTE: We only support macro with int32_t type now.
|
||||
} else if (from.isString()) {
|
||||
*to = from.toString();
|
||||
}
|
||||
|
||||
@@ -233,6 +233,14 @@ inline bool sevalue_to_native(const se::Value &from, double *to, se::Object * /*
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool sevalue_to_native(const se::Value &from, cc::TextureCube **to, se::Object *ctx);// NOLINT(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::TextureCube *to, se::Object *ctx);// NOLINT(readability-identifier-naming)
|
||||
|
||||
bool sevalue_to_native(const se::Value &from, cc::ImageAsset **to, se::Object *ctx);// NOLINT(readability-identifier-naming)
|
||||
bool sevalue_to_native(const se::Value &from, cc::ImageAsset *to, se::Object *ctx);// NOLINT(readability-identifier-naming)
|
||||
|
||||
//inline bool sevalue_to_native(const se::Value & /*from*/, void * /*to*/, se::Object * /*ctx*/) { // NOLINT(readability-identifier-naming)
|
||||
// assert(false); // void not supported
|
||||
// return false;
|
||||
@@ -288,7 +296,7 @@ inline bool sevalue_to_native(const se::Value &from, std::vector<se::Value> *to,
|
||||
////////////////// cc::any
|
||||
inline bool sevalue_to_native(const se::Value & /*from*/, cc::any * /*to*/, se::Object * /*ctx*/) { // NOLINT(readability-identifier-naming)
|
||||
assert(false);
|
||||
//TODO(PatriceJiang): convert any to specific types
|
||||
SE_LOGE("Can not convert any to specific types");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -482,7 +490,7 @@ inline bool nativevalue_to_se(const cc::monostate & /*from*/, se::Value &to, se:
|
||||
|
||||
inline bool nativevalue_to_se(const cc::any &from, se::Value &to, se::Object *ctx) { //NOLINT
|
||||
assert(false);
|
||||
//TODO(PatriceJiang): // should not convert cc::any
|
||||
SE_LOGE("should not convert cc::any");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user