TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-30 01:21:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac fixes

Browse source 
1) add sdl token for referencing the parent directory of the aplication bundle when determining the root dir
2) shape and mateiral asset macro corrections for a few stray ## redundencies (space, ->, . ect are all conidered token sperators in and of themselves)
This commit is contained in:
AzaezelX 2020-12-30 19:36:51 -06:00
parent 1fbf46fa90
commit 6b53b6581a
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -198,7 +198,7 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
if (stream->writeFlag(m##name##Asset.notNull()))\
{\
NetStringHandle assetIdStr = m##name##Asset.getAssetId();\
##netconn##->packNetStringHandleU(stream, assetIdStr);\
netconn->packNetStringHandleU(stream, assetIdStr);\
}\
else\
stream->writeString(m##name##Name);
@ -206,7 +206,7 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
#define unpackMaterialAsset(netconn, name)\
if (stream->readFlag())\
{\
m##name##AssetId = StringTable->insert(##netconn##->unpackNetStringHandleU(stream).getString());\
m##name##AssetId = StringTable->insert(netconn->unpackNetStringHandleU(stream).getString());\
MaterialAsset::getAssetById(m##name##AssetId, &m##name##Asset);\
}\
else\

4
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -269,14 +269,14 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
}\
return false;\
}\
void className::pack##name##Asset(BitStream *stream)\
void pack##name##Asset(BitStream *stream)\
{\
if (stream->writeFlag(m##name##Asset.notNull()))\
stream->writeString(m##name##Asset.getAssetId());\
else\
stream->writeString(m##name##Name);\
}\
void className::unpack##name##Asset(BitStream *stream)\
void unpack##name##Asset(BitStream *stream)\
{\
if (stream->readFlag())\
{\

2
Tools/CMake/Info.plist.in
View file

@ -16,5 +16,7 @@
<string>APPL</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>SDL_FILESYSTEM_BASE_DIR_TYPE</key>
<string>parent</string>
</dict>
</plist>