rublox/studio
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 1 Wiki Activity

Team Create (���������� ��������������) + ���������� ���� + ������ 16/17/20/40/44/05 #34

Merged
min merged 69 commits from restore/all-tasks into main 2026-06-08 01:13:01 +00:00
Conversation 0 Commits 69 Files Changed 33 +8 -1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ece149924 - Show all commits

9
src/editor/engine/PrimitiveManager.js
View File

@ -186,6 +186,10 @@ export class PrimitiveManager {
primitiveId: id, primitiveId: id,
primitiveType: type, primitiveType: type,
primitiveKind: typeDef.kind, primitiveKind: typeDef.kind,
// canCollide в metadata нужен camera-clamp (PlayerController):
// без него камера 3-го лица цепляется за проходимые зоны/триггеры
// (canCollide:false) и прыгает к игроку внутри зоны. Баг 2026-06-05.
canCollide,
}; };
// textureAsset — id картинки из AssetManager (пользовательская // textureAsset — id картинки из AssetManager (пользовательская
@ -754,7 +758,10 @@ export class PrimitiveManager {
this._applyMaterial(data.mesh, typeDef, data.color, data.material); this._applyMaterial(data.mesh, typeDef, data.color, data.material);
} }
if (patch.canCollide !== undefined) data.canCollide = patch.canCollide; if (patch.canCollide !== undefined) {
data.canCollide = patch.canCollide;
if (data.mesh?.metadata) data.mesh.metadata.canCollide = patch.canCollide;
}
if (patch.locked !== undefined) data.locked = !!patch.locked; if (patch.locked !== undefined) data.locked = !!patch.locked;
if (patch.visible !== undefined) { if (patch.visible !== undefined) {
data.visible = patch.visible; data.visible = patch.visible;