TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1153

Browse source
This commit is contained in:
Anis A. Hireche 2016-02-26 14:39:38 +01:00
commit 10cb6ab9c4
893 changed files with 44063 additions and 6437 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/util/imposterCapture.cpp
View file

@ -136,6 +136,7 @@ void ImposterCaptureMaterialHook::_overrideFeatures( ProcessedMaterial *mat,
fd.features.addFeature( MFT_NormalsOut );
fd.features.addFeature( MFT_ForwardShading );
fd.features.addFeature( MFT_Imposter );
}
ImposterCaptureMaterialHook* ImposterCaptureMaterialHook::_getOrCreateHook( BaseMatInstance *inMat )

2
Engine/source/util/settings.cpp
View file

@ -648,7 +648,7 @@ DefineConsoleMethod(Settings, setValue, void, (const char * settingName, const c
{
StringTableEntry fieldName = StringTable->insert( settingName );
if (!dStrIsEmpty(value))
if (!String::isEmpty(value))
object->setValue( fieldName, value );
else
object->setValue( fieldName );

2
Engine/source/util/triBoxCheck.h
View file

@ -38,7 +38,7 @@ bool triBoxOverlap(const Point3F &boxcenter, const Point3F &boxhalfsize, const P
/// Massage stuff into right format for triBoxOverlap test. This is really
/// just a helper function - use the other version if you want to be fast!
inline bool triBoxOverlap(Box3F box, Point3F a, Point3F b, Point3F c)
inline bool triBoxOverlap(Box3F box, const Point3F& a, const Point3F& b, const Point3F& c)
{
Point3F halfSize(box.len_x() / 2.f, box.len_y() / 2.f, box.len_z() / 2.f);

4
Engine/source/util/triRayCheck.cpp
View file

@ -125,8 +125,8 @@ bool intersect_triangle(Point3F orig, Point3F dir,
}
//*** Taken from TSE, and based on the above
bool castRayTriangle(Point3F orig, Point3F dir,
Point3F vert0, Point3F vert1, Point3F vert2,
bool castRayTriangle(const Point3F& orig, const Point3F& dir,
const Point3F& vert0, const Point3F& vert1, const Point3F& vert2,
F32 &t, Point2F &bary)
{
Point3F tvec, qvec;

2
Engine/source/util/triRayCheck.h
View file

@ -38,7 +38,7 @@ bool intersect_triangle(Point3F orig, Point3F dir,
F32& t, F32& u, F32& v);
//*** Taken from TSE, but based on the above
bool castRayTriangle(Point3F orig, Point3F dir, Point3F vert0, Point3F vert1, Point3F vert2, F32 &t, Point2F &bary);
bool castRayTriangle(const Point3F& orig, const Point3F& dir, const Point3F& vert0, const Point3F& vert1, const Point3F& vert2, F32 &t, Point2F &bary);
bool castRayTriangle(const Point3D &orig, const Point3D &dir, const Point3D &vert0, const Point3D &vert1, const Point3D &vert2);
#endif // _TRIRAYCHECK_H_

2
Engine/source/util/undo.cpp
View file

@ -504,7 +504,7 @@ void UndoManager::popCompound( bool discard )
DefineConsoleMethod(UndoAction, addToManager, void, (const char * undoManager), (""), "action.addToManager([undoManager])")
{
UndoManager *theMan = NULL;
if (!dStrIsEmpty(undoManager))
if (!String::isEmpty(undoManager))
{
SimObject *obj = Sim::findObject(undoManager);
if(obj)

6
Engine/source/util/undo.h
View file

@ -29,6 +29,12 @@
#ifndef _TVECTOR_H_
#include "core/util/tVector.h"
#endif
#ifndef _SIMBASE_H_
#include "console/simBase.h"
#endif
#ifndef _ENGINEAPI_H_
#include "console/engineAPI.h"
#endif
class UndoManager;