Skip to content

Commit

Permalink
Nothing special.
Browse files Browse the repository at this point in the history
  • Loading branch information
gildor2 committed Mar 10, 2019
1 parent ceee91b commit d1880c7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"cwd": "${workspaceFolder}",
"environment": [],
"externalConsole": false,
"logging": { "moduleLoad": false },
"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
},
{
Expand All @@ -25,6 +26,7 @@
"args": [ "C:/3-UnrealEngine/Paragon/OrionGame/Content/Paks", "-game=paragon" ],
"cwd": "${workspaceFolder}",
"externalConsole": false,
"logging": { "moduleLoad": false },
"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
},
{
Expand All @@ -35,6 +37,7 @@
"args": [ "C:/TEMP/UE4_Packaged/WindowsNoEditor/ShooterGame/Content/Paks", "-game=ue4.21" ],
"cwd": "${workspaceFolder}",
"externalConsole": false,
"logging": { "moduleLoad": false },
"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
}
]
Expand Down
7 changes: 6 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,18 @@
"FQUAT",
"FROTATOR",
"FVECTOR",
"LODs",
"SKEL",
"SKELMESH",
"Strncpyz",
"Tris",
"UMODEL",
"coord",
"tex",
"uasset",
"ubulk",
"uexp",
"unguardf"
"unguardf",
"uv"
]
}
4 changes: 2 additions & 2 deletions Unreal/UnMesh4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2029,7 +2029,7 @@ void UStaticMesh4::ConvertMesh()
ConvertedMesh = Mesh;

// convert bounds
Mesh->BoundingSphere.R = Bounds.SphereRadius / 2; //?? UE3 meshes has radius 2 times larger than mesh itself; verifty for UE4
Mesh->BoundingSphere.R = Bounds.SphereRadius / 2; //?? UE3 meshes has radius 2 times larger than mesh itself; verify for UE4
VectorSubtract(CVT(Bounds.Origin), CVT(Bounds.BoxExtent), CVT(Mesh->BoundingBox.Min));
VectorAdd (CVT(Bounds.Origin), CVT(Bounds.BoxExtent), CVT(Mesh->BoundingBox.Max));

Expand Down Expand Up @@ -2153,7 +2153,7 @@ void UStaticMesh4::ConvertSourceModels()

// convert bounds
// (note: copy-paste of ConvertedMesh's code)
Mesh->BoundingSphere.R = Bounds.SphereRadius / 2; //?? UE3 meshes has radius 2 times larger than mesh itself; verifty for UE4
Mesh->BoundingSphere.R = Bounds.SphereRadius / 2; //?? UE3 meshes has radius 2 times larger than mesh itself; verify for UE4
VectorSubtract(CVT(Bounds.Origin), CVT(Bounds.BoxExtent), CVT(Mesh->BoundingBox.Min));
VectorAdd (CVT(Bounds.Origin), CVT(Bounds.BoxExtent), CVT(Mesh->BoundingBox.Max));

Expand Down
2 changes: 1 addition & 1 deletion Unreal/UnRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static GLuint GetDefaultTexNum();
//#define DEBUG_MIPS 1 // use to debug decompression of lower mip levels, especially for XBox360


#if PROFILE || DEBUG_UPLOAD
#if DEBUG_UPLOAD
// profiling
#define PROFILE_UPLOAD(...) __VA_ARGS__
#define PROFILE_SHADER(...) __VA_ARGS__
Expand Down

0 comments on commit d1880c7

Please sign in to comment.