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

������ 14/16/20/40/44: vehicle, ����, ����������, damage floaters, ��������� #20

Merged
min merged 30 commits from feat/vehicle-task14 into main 2026-06-07 14:09:59 +00:00
Conversation 0 Commits 30 Files Changed 15 +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fe7e402ebc - Show all commits

6
src/engine/PrimitiveManager.js
View File

@ -156,6 +156,7 @@ export class PrimitiveManager {
primitiveId: id, primitiveId: id,
primitiveType: type, primitiveType: type,
primitiveKind: typeDef.kind, primitiveKind: typeDef.kind,
canCollide, // нужен camera-clamp: камера не цепляется за зоны canCollide:false
}; };
// textureAsset — id картинки из AssetManager (пользовательская // textureAsset — id картинки из AssetManager (пользовательская
@ -709,7 +710,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;