Skip to content

Commit a855400

Browse files
qiuguohuaqiuguohua
authored
Move pal directory to private repository (#191)
1 parent 3aeb193 commit a855400

425 files changed

Lines changed: 182 additions & 54443 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/native-ts-build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
with:
2929
node-version: ${{ matrix.node-version }}
3030
- run: npm ci --ignore-scripts
31+
- run: node scripts/spread-pal.cjs
3132
- run: npm run build:debug-infos
3233
- name: Download external
3334
run: |

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,11 @@ platforms/runtime/platforms/vivo-mini-game/ral.min.js
4646
@types/consts.d.ts
4747

4848
__TS_ENGINE__/
49+
50+
# pal 由 @cocos/engine-pal 在 postinstall 挂载(软链/复制)，不入库
51+
/pal
52+
53+
# platforms 源码已抽到 @cocos/engine-platforms；其预打包 adapter 由 postinstall 的
54+
# spread-adapter.cjs 复制到 bin/adapter(/bin 已忽略)。platforms 源码不再入库。
55+
/platforms
56+

‎cc.config.json‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -382,70 +382,70 @@
382382
"test": "context.buildTimeConstants && context.buildTimeConstants.HTML5",
383383
"isVirtualModule": true,
384384
"overrides": {
385-
"pal/minigame": "pal/minigame/non-minigame.ts",
386-
"pal/audio": "pal/audio/web/player.ts",
387-
"pal/system-info": "pal/system-info/web/system-info.ts",
388-
"pal/screen-adapter": "pal/screen-adapter/web/screen-adapter.ts",
389-
"pal/input": "pal/input/web/index.ts",
390-
"pal/env": "pal/env/web/env.ts",
391-
"pal/pacer": "pal/pacer/pacer-web.ts",
392-
"pal/wasm": "pal/wasm/wasm-web.ts"
385+
"pal/minigame": "pal/minigame/non-minigame.js",
386+
"pal/audio": "pal/audio/web/player.js",
387+
"pal/system-info": "pal/system-info/web/system-info.js",
388+
"pal/screen-adapter": "pal/screen-adapter/web/screen-adapter.js",
389+
"pal/input": "pal/input/web/index.js",
390+
"pal/env": "pal/env/web/env.js",
391+
"pal/pacer": "pal/pacer/pacer-web.js",
392+
"pal/wasm": "pal/wasm/wasm-web.js"
393393
}
394394
},
395395
{
396396
"test": "context.buildTimeConstants && context.buildTimeConstants.NATIVE",
397397
"isVirtualModule": true,
398398
"overrides": {
399-
"pal/minigame": "pal/minigame/non-minigame.ts",
400-
"pal/audio": "pal/audio/native/player.ts",
401-
"pal/system-info": "pal/system-info/native/system-info.ts",
402-
"pal/screen-adapter": "pal/screen-adapter/native/screen-adapter.ts",
403-
"pal/input": "pal/input/native/index.ts",
404-
"pal/env": "pal/env/native/env.ts",
405-
"pal/pacer": "pal/pacer/pacer-native.ts",
406-
"pal/wasm": "pal/wasm/wasm-native.ts"
399+
"pal/minigame": "pal/minigame/non-minigame.js",
400+
"pal/audio": "pal/audio/native/player.js",
401+
"pal/system-info": "pal/system-info/native/system-info.js",
402+
"pal/screen-adapter": "pal/screen-adapter/native/screen-adapter.js",
403+
"pal/input": "pal/input/native/index.js",
404+
"pal/env": "pal/env/native/env.js",
405+
"pal/pacer": "pal/pacer/pacer-native.js",
406+
"pal/wasm": "pal/wasm/wasm-native.js"
407407
}
408408
},
409409
{
410410
"test": "context.buildTimeConstants && context.buildTimeConstants.MINIGAME",
411411
"isVirtualModule": true,
412412
"overrides": {
413-
"pal/minigame": "pal/minigame/{{context.platform.toLowerCase()}}.ts",
414-
"pal/audio": "pal/audio/minigame/player.ts",
415-
"pal/system-info": "pal/system-info/minigame/system-info.ts",
416-
"pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.ts",
417-
"pal/input": "pal/input/minigame/index.ts",
418-
"pal/env": "pal/env/minigame/env.ts",
419-
"pal/pacer": "pal/pacer/pacer-minigame.ts",
420-
"pal/wasm": "pal/wasm/wasm-minigame.ts"
413+
"pal/minigame": "pal/minigame/{{context.platform.toLowerCase()}}.js",
414+
"pal/audio": "pal/audio/minigame/player.js",
415+
"pal/system-info": "pal/system-info/minigame/system-info.js",
416+
"pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.js",
417+
"pal/input": "pal/input/minigame/index.js",
418+
"pal/env": "pal/env/minigame/env.js",
419+
"pal/pacer": "pal/pacer/pacer-minigame.js",
420+
"pal/wasm": "pal/wasm/wasm-minigame.js"
421421
}
422422
},
423423
{
424424
"test": "context.buildTimeConstants && context.buildTimeConstants.RUNTIME_BASED",
425425
"isVirtualModule": true,
426426
"overrides": {
427-
"pal/minigame": "pal/minigame/runtime.ts",
428-
"pal/audio": "pal/audio/minigame/player.ts",
429-
"pal/system-info": "pal/system-info/minigame/system-info.ts",
430-
"pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.ts",
431-
"pal/input": "pal/input/minigame/index.ts",
432-
"pal/env": "pal/env/runtime/env.ts",
433-
"pal/pacer": "pal/pacer/pacer-minigame.ts",
434-
"pal/wasm": "pal/wasm/wasm-minigame.ts"
427+
"pal/minigame": "pal/minigame/runtime.js",
428+
"pal/audio": "pal/audio/minigame/player.js",
429+
"pal/system-info": "pal/system-info/minigame/system-info.js",
430+
"pal/screen-adapter": "pal/screen-adapter/minigame/screen-adapter.js",
431+
"pal/input": "pal/input/minigame/index.js",
432+
"pal/env": "pal/env/runtime/env.js",
433+
"pal/pacer": "pal/pacer/pacer-minigame.js",
434+
"pal/wasm": "pal/wasm/wasm-minigame.js"
435435
}
436436
},
437437
{
438438
"test": "context.buildTimeConstants && context.buildTimeConstants.NODEJS",
439439
"isVirtualModule": true,
440440
"overrides": {
441-
"pal/minigame": "pal/minigame/non-minigame.ts",
442-
"pal/audio": "pal/audio/nodejs/player.ts",
443-
"pal/system-info": "pal/system-info/nodejs/system-info.ts",
444-
"pal/screen-adapter": "pal/screen-adapter/nodejs/screen-adapter.ts",
445-
"pal/input": "pal/input/nodejs/index.ts",
446-
"pal/env": "pal/env/nodejs/env.ts",
447-
"pal/pacer": "pal/pacer/pacer-nodejs.ts",
448-
"pal/wasm": "pal/wasm/wasm-nodejs.ts"
441+
"pal/minigame": "pal/minigame/non-minigame.js",
442+
"pal/audio": "pal/audio/nodejs/player.js",
443+
"pal/system-info": "pal/system-info/nodejs/system-info.js",
444+
"pal/screen-adapter": "pal/screen-adapter/nodejs/screen-adapter.js",
445+
"pal/input": "pal/input/nodejs/index.js",
446+
"pal/env": "pal/env/nodejs/env.js",
447+
"pal/pacer": "pal/pacer/pacer-nodejs.js",
448+
"pal/wasm": "pal/wasm/wasm-nodejs.js"
449449
}
450450
},
451451
{
@@ -885,10 +885,10 @@
885885
"cocos/asset/asset-manager/weak-cache.ts",
886886
"cocos/2d/framework/ui-skew-utils.ts",
887887
"cocos/spine/lib/spine-binary.ts",
888-
"pal/input/minigame/gamepad-input.ts",
889-
"pal/input/minigame/handheld-input.ts",
890-
"pal/input/minigame/handle-input.ts",
891-
"pal/input/minigame/hmd-input.ts"
888+
"pal/input/minigame/gamepad-input.js",
889+
"pal/input/minigame/handheld-input.js",
890+
"pal/input/minigame/handle-input.js",
891+
"pal/input/minigame/hmd-input.js"
892892
]
893893
}
894894
}

‎cocos/render-scene/core/render-window.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
THE SOFTWARE.
2323
*/
24+
import { DEBUG } from 'internal:constants';
2425
import { screenAdapter } from 'pal/screen-adapter';
2526
import { Orientation } from '../../../pal/screen-adapter/enum-type';
2627
import {
2728
TextureType, TextureUsageBit, Format, RenderPass, Texture, Framebuffer,
2829
RenderPassInfo, Device, TextureInfo, FramebufferInfo, Swapchain, SurfaceTransform, TextureFlagBit, TextureFlags,
2930
} from '../../gfx';
31+
import { warn } from '../../core/platform/debug';
3032
import { Root } from '../../root';
3133
import { Camera } from '../scene';
3234

@@ -41,7 +43,10 @@ export interface IRenderWindowInfo {
4143
externalFlag?: TextureFlags; // external texture type normal or oes
4244
}
4345

44-
const orientationMap: Record<Orientation, SurfaceTransform> = {
46+
// NOTE: `Orientation` is a flag enum whose composite members (LANDSCAPE, AUTO) are never
47+
// actual runtime orientations, so this map intentionally only covers the physical ones.
48+
// It is therefore typed as Partial rather than a total Record<Orientation, ...>.
49+
const orientationMap: Partial<Record<Orientation, SurfaceTransform>> = {
4550
[Orientation.PORTRAIT]: SurfaceTransform.IDENTITY,
4651
[Orientation.LANDSCAPE_RIGHT]: SurfaceTransform.ROTATE_90,
4752
[Orientation.PORTRAIT_UPSIDE_DOWN]: SurfaceTransform.ROTATE_180,
@@ -253,7 +258,11 @@ export class RenderWindow {
253258
*/
254259
public resize (width: number, height: number): void {
255260
if (this._swapchain) {
256-
this._swapchain.resize(width, height, orientationMap[screenAdapter.orientation]);
261+
const surfaceTransform = orientationMap[screenAdapter.orientation];
262+
if (DEBUG && surfaceTransform === undefined) {
263+
warn(`Unexpected screen orientation: ${screenAdapter.orientation}`);
264+
}
265+
this._swapchain.resize(width, height, surfaceTransform || SurfaceTransform.IDENTITY);
257266
this._width = this._swapchain.width;
258267
this._height = this._swapchain.height;
259268
} else {

‎package-lock.json‎

Lines changed: 20 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"node": ">=18.0.0"
1313
},
1414
"scripts": {
15-
"postinstall": "npm run build:debug-infos && npm run build:declaration && npm run build:adapter && npm run build:native-pack-tool",
15+
"postinstall": "node scripts/spread-pal.cjs && npm run build:debug-infos && npm run build:declaration && node scripts/spread-adapter.cjs && npm run build:native-pack-tool",
1616
"build": "npm run build:min && npm run build:declaration",
1717
"build:cli": "npm run build:cli-min && npm run build:declaration",
1818
"build:adapter": "node ./scripts/build-adapter.js",
@@ -81,8 +81,14 @@
8181
"@babel/plugin-proposal-class-properties": "^7.18.6",
8282
"@cocos/box2d": "1.0.2",
8383
"@cocos/cannon": "1.2.8",
84-
"@cocos/ccbuild": "^2.3.16",
84+
"@cocos/ccbuild": "^2.3.21",
8585
"@cocos/dragonbones-js": "^1.0.1",
86+
"@cocos/engine-pal": "^1.0.4",
87+
"@cocos/engine-platforms": "^1.0.5",
8688
"@types/jest": "^24.9.1"
87-
}
89+
},
90+
"creator": {
91+
"version": "3.8.8"
92+
},
93+
"uuid": "8be51d4a-79ad-481c-adbf-265693b5adbf"
8894
}

‎pal/audio/audio-buffer-manager.ts‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)