TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 14:00:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #991 from AtomicWalrus/AssetDropInProjectionLagFix

Browse source 
(Obj spawning) Only project to farplane to avoid hang/crash w/ high fardist
This commit is contained in:
Brian Roberts 2023-03-13 11:27:53 -05:00 • committed by GitHub
commit 7b676ee6bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/creatorObj.tscript
View file

@ -33,7 +33,7 @@ function AssetBrowser::onCreatorEditorDropped(%this, %assetDef, %position)
{
if(EditorIsActive())
{
%targetPosition = EWorldEditor.unproject(%position SPC 1000);
%targetPosition = EWorldEditor.unproject(%position SPC 1);
%camPos = LocalClientConnection.camera.getPosition();
%rayResult = containerRayCast(%camPos, %targetPosition, -1);

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/datablockObjects.tscript
View file

@ -167,7 +167,7 @@ function AssetBrowser::deleteDatablock(%this, %folderPath)
function AssetBrowser::onDatablockEditorDropped(%this, %assetDef, %position)
{
%targetPosition = EWorldEditor.unproject(%position SPC 1000);
%targetPosition = EWorldEditor.unproject(%position SPC 1);
%camPos = LocalClientConnection.camera.getPosition();
%rayResult = containerRayCast(%camPos, %targetPosition, -1);

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript
View file

@ -116,7 +116,7 @@ function AssetBrowser::onGameObjectAssetEditorDropped(%this, %assetDef, %positio
{
//echo("DROPPED A SHAPE ON THE EDITOR WINDOW!");
%targetPosition = EWorldEditor.unproject(%position SPC 1000);
%targetPosition = EWorldEditor.unproject(%position SPC 1);
%camPos = LocalClientConnection.camera.getPosition();
%rayResult = containerRayCast(%camPos, %targetPosition, -1);

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript
View file

@ -554,7 +554,7 @@ function AssetBrowser::onMaterialAssetEditorDropped(%this, %assetDef, %position)
//first, see if we hit a static shape
%mask = $TypeMasks::StaticObjectType | $TypeMasks::StaticShapeObjectType | $TypeMasks::TerrainObjectType;
%targetPosition = EWorldEditor.unproject(%position SPC 1000);
%targetPosition = EWorldEditor.unproject(%position SPC 1);
%camPos = LocalClientConnection.camera.getPosition();
%rayResult = materialRayCast(%camPos, %targetPosition, -1, 0, false);

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/prefab.tscript
View file

@ -34,7 +34,7 @@ function AssetBrowser::onPrefabEditorDropped(%this, %assetDef, %position)
{
//echo("DROPPED A SHAPE ON THE EDITOR WINDOW!");
%targetPosition = EWorldEditor.unproject(%position SPC 1000);
%targetPosition = EWorldEditor.unproject(%position SPC 1);
%camPos = LocalClientConnection.camera.getPosition();
%rayResult = containerRayCast(%camPos, %targetPosition, -1);

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/sound.tscript
View file

@ -57,7 +57,7 @@ function AssetBrowser::buildSoundAssetPreview(%this, %assetDef, %previewData)
function AssetBrowser::onSoundAssetEditorDropped(%this, %assetDef, %position)
{
%targetPosition = EWorldEditor.unproject(%position SPC 1000);
%targetPosition = EWorldEditor.unproject(%position SPC 1);
%camPos = LocalClientConnection.camera.getPosition();
%rayResult = containerRayCast(%camPos, %targetPosition, -1);