mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 15:14:35 +00:00
mac fixes
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:
parent
1fbf46fa90
commit
6b53b6581a
3 changed files with 6 additions and 4 deletions
|
|
@ -198,7 +198,7 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
|
||||||
if (stream->writeFlag(m##name##Asset.notNull()))\
|
if (stream->writeFlag(m##name##Asset.notNull()))\
|
||||||
{\
|
{\
|
||||||
NetStringHandle assetIdStr = m##name##Asset.getAssetId();\
|
NetStringHandle assetIdStr = m##name##Asset.getAssetId();\
|
||||||
##netconn##->packNetStringHandleU(stream, assetIdStr);\
|
netconn->packNetStringHandleU(stream, assetIdStr);\
|
||||||
}\
|
}\
|
||||||
else\
|
else\
|
||||||
stream->writeString(m##name##Name);
|
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)\
|
#define unpackMaterialAsset(netconn, name)\
|
||||||
if (stream->readFlag())\
|
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);\
|
MaterialAsset::getAssetById(m##name##AssetId, &m##name##Asset);\
|
||||||
}\
|
}\
|
||||||
else\
|
else\
|
||||||
|
|
|
||||||
|
|
@ -269,14 +269,14 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
|
||||||
}\
|
}\
|
||||||
return false;\
|
return false;\
|
||||||
}\
|
}\
|
||||||
void className::pack##name##Asset(BitStream *stream)\
|
void pack##name##Asset(BitStream *stream)\
|
||||||
{\
|
{\
|
||||||
if (stream->writeFlag(m##name##Asset.notNull()))\
|
if (stream->writeFlag(m##name##Asset.notNull()))\
|
||||||
stream->writeString(m##name##Asset.getAssetId());\
|
stream->writeString(m##name##Asset.getAssetId());\
|
||||||
else\
|
else\
|
||||||
stream->writeString(m##name##Name);\
|
stream->writeString(m##name##Name);\
|
||||||
}\
|
}\
|
||||||
void className::unpack##name##Asset(BitStream *stream)\
|
void unpack##name##Asset(BitStream *stream)\
|
||||||
{\
|
{\
|
||||||
if (stream->readFlag())\
|
if (stream->readFlag())\
|
||||||
{\
|
{\
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,7 @@
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1.0</string>
|
<string>1.0</string>
|
||||||
|
<key>SDL_FILESYSTEM_BASE_DIR_TYPE</key>
|
||||||
|
<string>parent</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue