Merge branch 'v3.5.0' into v3.6_merge_v3.5

This commit is contained in:
minggo
2022-03-29 18:26:40 +08:00
673 changed files with 13730 additions and 5737 deletions
@@ -40,18 +40,6 @@ namespace {
namespace cc {
bool SystemWindow::createWindow(const char *title,
int x, int y, int w,
int h, int flags) {
CC_UNUSED_PARAM(title);
CC_UNUSED_PARAM(x);
CC_UNUSED_PARAM(y);
CC_UNUSED_PARAM(w);
CC_UNUSED_PARAM(h);
CC_UNUSED_PARAM(flags);
return true;
}
void SystemWindow::setCursorEnabled(bool value) {
}
@@ -69,4 +57,4 @@ SystemWindow::Size SystemWindow::getViewSize() const {
static_cast<float>(JNI_NATIVE_GLUE()->getHeight())};
}
} // namespace cc
} // namespace cc