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

Final Linux compliance changes(renames, tweaks for gcc compliance, etc)

Browse source
This commit is contained in:
Areloch 2016-05-29 00:58:02 -05:00
parent f5e86a83b5
commit 510b726f6f
25 changed files with 47 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/components/render/meshComponent.cpp
View file

@ -21,7 +21,7 @@
//-----------------------------------------------------------------------------
#include "platform/platform.h"
#include "console/consoleTypes.h"
#include "T3D/components/render/meshcomponent.h"
#include "T3D/components/render/meshComponent.h"
#include "core/util/safeDelete.h"
#include "core/resourceManager.h"
#include "core/stream/fileStream.h"
@ -222,7 +222,9 @@ U32 MeshComponent::packUpdate(NetConnection *con, U32 mask, BitStream *stream)
for(U32 i=0; i < mChangingMaterials.size(); i++)
{
stream->writeInt(mChangingMaterials[i].slot, 16);
con->packNetStringHandleU(stream, NetStringHandle(mChangingMaterials[i].matName));
NetStringHandle matNameStr = mChangingMaterials[i].matName.c_str();
con->packNetStringHandleU(stream, matNameStr);
}
mChangingMaterials.clear();

2
Engine/source/T3D/components/render/meshComponent.h
View file

@ -153,7 +153,7 @@ public:
virtual TSShape* getShape() { if (mMeshAsset) return mMeshAsset->getShape(); else return NULL; }
virtual TSShapeInstance* getShapeInstance() { return mShapeInstance; }
Resource<TSShape> getShapeResource() { if (mMeshAsset) return mMeshAsset->getShapeResource(); else return NULL; }
Resource<TSShape> getShapeResource() { return mMeshAsset->getShapeResource(); }
void _onResourceChanged(const Torque::Path &path);

2
Engine/source/T3D/components/render/meshComponent_ScriptBinding.h
View file

@ -21,7 +21,7 @@
//-----------------------------------------------------------------------------
#include "console/engineAPI.h"
#include "T3D/components/render/meshcomponent.h"
#include "T3D/components/render/meshComponent.h"
#include "scene/sceneObject.h"
#include "math/mTransform.h"

8
Engine/source/T3D/components/render/renderComponentInterface.h
View file

@ -24,10 +24,10 @@
#define RENDER_COMPONENT_INTERFACE_H
#ifndef _TSSHAPE_H_
#include "ts/TSShape.h"
#include "ts/tsShape.h"
#endif
#ifndef _TSSHAPEINSTANCE_H_
#include "ts/TSShapeInstance.h"
#include "ts/tsShapeInstance.h"
#endif
#ifndef CORE_INTERFACES_H
#include "T3D/components/coreInterfaces.h"
@ -40,7 +40,7 @@ public:
virtual TSShape* getShape() = 0;
Signal< void(RenderComponentInterface*) > RenderComponentInterface::onShapeChanged;
Signal< void(RenderComponentInterface*) > onShapeChanged;
virtual TSShapeInstance* getShapeInstance() = 0;
@ -50,7 +50,7 @@ public:
virtual void setNodeTransforms(Vector<MatrixF> transforms) = 0;
Signal< void(RenderComponentInterface*) > RenderComponentInterface::onShapeInstanceChanged;
Signal< void(RenderComponentInterface*) > onShapeInstanceChanged;
};
class CastRayRenderedInterface// : public Interface<CastRayRenderedInterface>