From 0fcde54bc25c9ebbdce59abfe0218b39e43a2a0f Mon Sep 17 00:00:00 2001 From: halx99 Date: Thu, 22 Oct 2020 10:23:41 +0800 Subject: [PATCH] Sync rename engine --- README.md | 18 +++++++++--------- README_CN.md | 24 ++++++++++++------------ external/config.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 6fe4fc9141..f7677ff4fc 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# EGNX -[![Build Status](https://travis-ci.com/c4games/engine-x.svg?branch=master)](https://travis-ci.com/c4games/engine-x) -[![Windows Build Status](https://ci.appveyor.com/api/projects/status/4936wev2r2ot606s/branch/master?svg=true)](https://ci.appveyor.com/project/halx99/engine-x) -[![dev](https://img.shields.io/badge/v1.0.0-alpha18-yellow.svg)](https://github.com/c4games/engine-x/releases) +# cocos-re - Cocos2dx Refine +[![Build Status](https://travis-ci.com/c4games/cocos-re.svg?branch=master)](https://travis-ci.com/c4games/cocos-re) +[![Windows Build Status](https://ci.appveyor.com/api/projects/status/4936wev2r2ot606s/branch/master?svg=true)](https://ci.appveyor.com/project/halx99/cocos-re) +[![dev](https://img.shields.io/badge/v1.0.0-alpha18-yellow.svg)](https://github.com/c4games/cocos-re/releases) -**This is another more radical fork of ```cocos2d-x v4```, use OpenAL for all platforms, single texture multi GPU texture handler, C++14/17, etc.** +**This is another more radical fork of *Cocos2d-x-4.0*, use OpenAL for all platforms, single texture multi GPU texture handler, C++14/17, etc.** **[简体中文](README_CN.md)** @@ -33,7 +33,7 @@ * Add ETC2 RGB/RGBA support, if hardware decoder not present, use software decoder * **ImGui integrated, easy to write game embedded tools, very ease to use, please read [ImGuiEXT](extensions/ImGuiEXT/README.md)** -### [Roadmap](https://github.com/c4games/engine-x/issues/1) +### [Roadmap](https://github.com/c4games/cocos-re/issues/1) ### Quick Start #### Common Requirement [python](https://www.python.org/downloads/) @@ -44,7 +44,7 @@ 2. Install Visual Studio 2019 build(we strong recommend you use this version) 3. Execute follow command at command line(Console, Window Terminal or Powershell) ```bat - cd engine-x\ + cd cocos-re\ cmake -S . -B build -G "Visual Studio 16 2019" -A Win32 ``` @@ -52,7 +52,7 @@ #### Android 1. Install Android Studio 4.0+ 2. When first start Android Studio, It will guide you to install sdk and other tools, just install them - 3. Start Android and choose [Open an existing Android Studio Project] to open ```engine-x\tests\cpp-tests\proj.android``` + 3. Start Android and choose [Open an existing Android Studio Project] to open ```cocos-re\tests\cpp-tests\proj.android``` 4. Start Android Studio and Open [Tools][SDKManager], then switch to ```SDK Tools```, check the ```Show Package Details```, choose follow tools and click the button ```Apply``` to install them: * Android SDK Platform 28 r3 * Android SDK Build-Tools 29.0.2 @@ -91,5 +91,5 @@ - the openal-soft maintained by kcat use TLS ### Reference links - * engine-x-3rd: https://github.com/c4games/engine-x-3rd + * cocos-re: https://github.com/c4games/cocos-re-3rd * official v4: https://github.com/cocos2d/cocos2d-x diff --git a/README_CN.md b/README_CN.md index f807c7be26..3fc6f26fda 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,9 +1,9 @@ -# EGNX -[![Build Status](https://travis-ci.com/c4games/engine-x.svg?branch=master)](https://travis-ci.com/c4games/engine-x) -[![Windows Build Status](https://ci.appveyor.com/api/projects/status/4936wev2r2ot606s/branch/master?svg=true)](https://ci.appveyor.com/project/halx99/engine-x) -[![dev](https://img.shields.io/badge/v1.0.0-alpha18-yellow.svg)](https://github.com/c4games/engine-x/releases) +# cocos-re - Cocos2dx Refine +[![Build Status](https://travis-ci.com/c4games/cocos-re.svg?branch=master)](https://travis-ci.com/c4games/cocos-re) +[![Windows Build Status](https://ci.appveyor.com/api/projects/status/4936wev2r2ot606s/branch/master?svg=true)](https://ci.appveyor.com/project/halx99/cocos-re) +[![dev](https://img.shields.io/badge/v1.0.0-alpha18-yellow.svg)](https://github.com/c4games/cocos-re/releases) -**这是另外一个基于 ```cocos2d-x-4.0``` 持续维护的分支, 全平台基于OpenAL, c++14/17...** +**这是另外一个基于 *Cocos2d-x-4.0* 持续维护的分支, 全平台基于OpenAL, c++14/17...** **[English](README.md)** @@ -34,7 +34,7 @@ * 新增硬件压缩纹理格式ETC2 RGB/RGBA支持，支持软解 * **ImGui集成，非常方便写游戏内嵌小工具，用法详见[ImGuiEXT](extensions/ImGuiEXT/README.md)** -### [Roadmap](https://github.com/c4games/engine-x/issues/1) +### [Roadmap](https://github.com/c4games/cocos-re/issues/1) ### 快速开始 @@ -46,15 +46,15 @@ 2. 确保Visual Studio 2019以正确安装 3. 执行下面的命令 ```bat - cd engine-x + cd cocos-re cmake -S . -B build -G "Visual Studio 16 2019" -A Win32 ``` - 4. 之后就可以用vs打开```engine-x/build/EGNX.sln```启动cpp-tests等测试工程了 + 4. 之后就可以用vs打开```cocos-re/build/EGNX.sln```启动cpp-tests等测试工程了 #### Android 1. 安装 Android Studio 4.0或更高版本 2. 第一次启动Android Studio, 会引导安装一些工具，默认安装即可，如果不需要模拟器可以把```Virutal Device```勾选去掉 - 2. 启动 Android Studio并打开engine-x\tests\cpp-tests\proj.android + 2. 启动 Android Studio并打开cocos-re\tests\cpp-tests\proj.android 3. 通过 [Tools][SdkManagers] 打开sdk管理工具，选择如下SDK Platforms和SDK Tools后， 点击按钮 ```Apply``` 一路跟着引导安装即可: * Android SDK Platform 28 r3 (在SDK Platforms页签) * Android SDK Build-Tools 29.0.2 @@ -68,7 +68,7 @@ 1. 确保已安装xcode11+和[cmake3.6+](https://github.com/Kitware/CMake/releases), 安装CMake命令行支持: ```sudo "/Applications/CMake.app/Contents/bin/cmake-gui" --install``` 2. 执行如下命令确保cmake能成功生成xcode工程: ```sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer``` - 3. 生成xcode工程, 进入engine-x根目录执行如下命令: + 3. 生成xcode工程, 进入cocos-re根目录执行如下命令: ```sh # for device arm64 cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.mini.cmake @@ -89,8 +89,8 @@ ### QQ交流群 - 点击链接加入群聊【engine-x交流群】：https://jq.qq.com/?_wv=1027&k=nvNmzOIY + 点击链接加入群聊【cocos-re交流群】：https://jq.qq.com/?_wv=1027&k=nvNmzOIY ### 参考链接 - * engine-x-3rd: https://github.com/c4games/engine-x-3rd + * cocos-re-3rd: https://github.com/c4games/cocos-re-3rd * official v4: https://gitee.com/mirrors/cocos2d-x diff --git a/external/config.json b/external/config.json index 89afca5148..c6f09e3733 100644 --- a/external/config.json +++ b/external/config.json @@ -1,7 +1,7 @@ { "version": "v79", "zip_file_size": "107642814", - "repo_name": "engine-x-3rd", + "repo_name": "cocos-re-3rd", "repo_parent": "https://github.com/c4games/", "move_dirs": { }