diff --git a/core/platform/CCImage.cpp b/core/platform/CCImage.cpp index 1c606c1f74..27cfbc4a53 100644 --- a/core/platform/CCImage.cpp +++ b/core/platform/CCImage.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. ****************************************************************************/ #include "platform/CCImage.h" -#include "renderer/backend/TextureUtils.h" +#include "renderer/backend/PixelFormatUtils.h" #include #include diff --git a/core/platform/desktop/CCGLViewImpl-desktop.cpp b/core/platform/desktop/CCGLViewImpl-desktop.cpp index a00aa83d3f..bca97a8d68 100644 --- a/core/platform/desktop/CCGLViewImpl-desktop.cpp +++ b/core/platform/desktop/CCGLViewImpl-desktop.cpp @@ -2,6 +2,8 @@ Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. +Copyright (c) 2020 C4games Ltd. +Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ @@ -293,7 +295,7 @@ GLViewImpl::GLViewImpl(bool initglfw) , _mouseX(0.0f) , _mouseY(0.0f) { - _viewName = "cocos2dx"; + _viewName = "AX_10"; g_keyCodeMap.clear(); for (auto& item : g_keyCodeStructArray) { diff --git a/core/renderer/CCTexture2D.cpp b/core/renderer/CCTexture2D.cpp index 658a5d1430..c4efa9e0be 100644 --- a/core/renderer/CCTexture2D.cpp +++ b/core/renderer/CCTexture2D.cpp @@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. Copyright (c) 2020 C4games Ltd -Copyright (c) 2021 Bytedance Inc. +Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ @@ -47,7 +47,7 @@ THE SOFTWARE. #include "renderer/backend/Device.h" #include "renderer/backend/ProgramState.h" #include "renderer/ccShaders.h" -#include "renderer/backend/TextureUtils.h" +#include "renderer/backend/PixelFormatUtils.h" #include "renderer/CCRenderer.h" #if CC_ENABLE_CACHE_TEXTURE_DATA diff --git a/core/renderer/CCTextureCube.cpp b/core/renderer/CCTextureCube.cpp index e62dbf37bd..7c60f6e973 100644 --- a/core/renderer/CCTextureCube.cpp +++ b/core/renderer/CCTextureCube.cpp @@ -1,6 +1,8 @@ /**************************************************************************** Copyright (c) 2015-2016 Chukong Technologies Inc. Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) C4games Ltd. + Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ @@ -28,7 +30,7 @@ #include "platform/CCFileUtils.h" #include "renderer/backend/Texture.h" #include "renderer/backend/Device.h" -#include "renderer/backend/TextureUtils.h" +#include "renderer/backend/PixelFormatUtils.h" NS_CC_BEGIN diff --git a/core/renderer/CMakeLists.txt b/core/renderer/CMakeLists.txt index e8766138f4..aebc22aafa 100644 --- a/core/renderer/CMakeLists.txt +++ b/core/renderer/CMakeLists.txt @@ -31,7 +31,7 @@ set(COCOS_RENDERER_HEADER renderer/backend/RenderPipeline.h renderer/backend/ShaderModule.h renderer/backend/Texture.h - renderer/backend/TextureUtils.h + renderer/backend/PixelFormatUtils.h renderer/backend/Types.h renderer/backend/VertexLayout.h renderer/backend/ProgramState.h @@ -65,7 +65,7 @@ set(COCOS_RENDERER_SRC renderer/backend/Device.cpp renderer/backend/ShaderModule.cpp renderer/backend/Texture.cpp - renderer/backend/TextureUtils.cpp + renderer/backend/PixelFormatUtils.cpp renderer/backend/Types.cpp renderer/backend/VertexLayout.cpp renderer/backend/ProgramCache.cpp diff --git a/core/renderer/backend/TextureUtils.cpp b/core/renderer/backend/PixelFormatUtils.cpp similarity index 99% rename from core/renderer/backend/TextureUtils.cpp rename to core/renderer/backend/PixelFormatUtils.cpp index 97f96cdfc1..edb3d4fc57 100644 --- a/core/renderer/backend/TextureUtils.cpp +++ b/core/renderer/backend/PixelFormatUtils.cpp @@ -1,6 +1,7 @@ /**************************************************************************** Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd. Copyright (c) 2020 C4games Ltd + Copyright (c) 2022 Bytedance Inc. https://adxeproject.github.io/ @@ -23,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "TextureUtils.h" +#include "PixelFormatUtils.h" #include "Macros.h" NS_CC_BEGIN diff --git a/core/renderer/backend/TextureUtils.h b/core/renderer/backend/PixelFormatUtils.h similarity index 99% rename from core/renderer/backend/TextureUtils.h rename to core/renderer/backend/PixelFormatUtils.h index 25472809ae..99ae186497 100644 --- a/core/renderer/backend/TextureUtils.h +++ b/core/renderer/backend/PixelFormatUtils.h @@ -1,5 +1,7 @@ /**************************************************************************** Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2020 C4games Ltd. + Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ diff --git a/core/renderer/backend/Texture.cpp b/core/renderer/backend/Texture.cpp index fadc7bdaf1..02e8ca7dce 100644 --- a/core/renderer/backend/Texture.cpp +++ b/core/renderer/backend/Texture.cpp @@ -1,6 +1,7 @@ /**************************************************************************** Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd. - Copyright (c) 2020 C4games Ltd + Copyright (c) 2020 C4games Ltd. + Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ @@ -24,7 +25,7 @@ ****************************************************************************/ #include "Texture.h" -#include "TextureUtils.h" +#include "PixelFormatUtils.h" #include CC_BACKEND_BEGIN diff --git a/core/renderer/backend/metal/TextureMTL.mm b/core/renderer/backend/metal/TextureMTL.mm index 03019695e3..120ee90cc1 100644 --- a/core/renderer/backend/metal/TextureMTL.mm +++ b/core/renderer/backend/metal/TextureMTL.mm @@ -1,5 +1,7 @@ /**************************************************************************** Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2020 C4games Ltd. + Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ @@ -25,7 +27,7 @@ #include "TextureMTL.h" #include "UtilsMTL.h" #include "base/ccMacros.h" -#include "../TextureUtils.h" +#include "../PixelFormatUtils.h" CC_BACKEND_BEGIN diff --git a/core/renderer/backend/metal/UtilsMTL.mm b/core/renderer/backend/metal/UtilsMTL.mm index e697a5988d..d225afc7ec 100644 --- a/core/renderer/backend/metal/UtilsMTL.mm +++ b/core/renderer/backend/metal/UtilsMTL.mm @@ -1,6 +1,7 @@ /**************************************************************************** Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd. - Copyright (c) 2020 C4games Ltd + Copyright (c) 2020 C4games Ltd. + Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ @@ -27,7 +28,7 @@ #include "DeviceMTL.h" #include "DeviceInfoMTL.h" #include "TextureMTL.h" -#include "../TextureUtils.h" +#include "../PixelFormatUtils.h" #include "base/CCConfiguration.h" CC_BACKEND_BEGIN diff --git a/core/renderer/backend/opengl/UtilsGL.cpp b/core/renderer/backend/opengl/UtilsGL.cpp index b59c87f5f6..e0b22a257e 100644 --- a/core/renderer/backend/opengl/UtilsGL.cpp +++ b/core/renderer/backend/opengl/UtilsGL.cpp @@ -1,6 +1,7 @@ /**************************************************************************** Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd. - Copyright (c) 2020 C4games Ltd + Copyright (c) 2020 C4games Ltd. + Copyright (c) 2021-2022 Bytedance Inc. https://adxeproject.github.io/ @@ -27,7 +28,7 @@ #include "ProgramGL.h" #include "TextureGL.h" #include "renderer/backend/Types.h" -#include "renderer/backend/TextureUtils.h" +#include "renderer/backend/PixelFormatUtils.h" #include "platform/CCGL.h" // In desktop OpenGL 4+ and OpenGL ES 3.0+, specific GL formats GL_x_INTEGER are used for integer textures.