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

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/editor/guiEaseViewCtrl.cpp
View file

@ -97,7 +97,7 @@ void GuiEaseViewCtrl::onRender(Point2I offset, const RectI &updateRect)
// Draw curve.
for( int i = 1; i <= numPoints; ++ i )
for( S32 i = 1; i <= numPoints; ++ i )
{
F32 x = ( F32 ) i / ( F32 ) numPoints;
F32 y = mEase.getValue( x, 0, 1, 1 );

2
Engine/source/gui/editor/guiGraphCtrl.cpp
View file

@ -274,7 +274,7 @@ void GuiGraphCtrl::addDatum(S32 plotID, F32 v)
//-----------------------------------------------------------------------------
float GuiGraphCtrl::getDatum( int plotID, int sample)
F32 GuiGraphCtrl::getDatum( S32 plotID, S32 sample)
{
AssertFatal(plotID > -1 && plotID < MaxPlots, "Invalid plot specified!");
AssertFatal(sample > -1 && sample < MaxDataPoints, "Invalid sample specified!");

2
Engine/source/gui/editor/guiImageList.cpp
View file

@ -182,7 +182,7 @@ DefineEngineMethod( GuiImageList, count, S32, (),,
return object->Count();
}
DefineEngineMethod( GuiImageList, remove, bool, (int index),,
DefineEngineMethod( GuiImageList, remove, bool, (S32 index),,
"@brief Removes an image from the list by index.\n\n"
"@param index Image index to remove.\n"
"@tsexample\n"

6
Engine/source/gui/editor/guiMenuBar.cpp
View file

@ -193,7 +193,7 @@ DefineEngineMethod( GuiMenuBar, setMenuMargins, void, (S32 horizontalMargin, S32
object->mBitmapMargin = bitmapToTextSpacing;
}
DefineEngineMethod(GuiMenuBar, addMenu, void, (const char* menuText, int menuId),,
DefineEngineMethod(GuiMenuBar, addMenu, void, (const char* menuText, S32 menuId),,
"@brief Adds a new menu to the menu bar.\n\n"
"@param menuText Text to display for the new menu item.\n"
"@param menuId ID for the new menu item.\n"
@ -215,7 +215,7 @@ DefineEngineMethod(GuiMenuBar, addMenu, void, (const char* menuText, int menuId)
object->addMenu(menuText, menuId);
}
DefineEngineMethod(GuiMenuBar, addMenuItem, void, (const char* targetMenu, const char* menuItemText, int menuItemId, const char* accelerator, int checkGroup),
DefineEngineMethod(GuiMenuBar, addMenuItem, void, (const char* targetMenu, const char* menuItemText, S32 menuItemId, const char* accelerator, int checkGroup),
("","",0,NULL,-1),
"@brief Adds a menu item to the specified menu. The menu argument can be either the text of a menu or its id.\n\n"
"@param menu Menu name or menu Id to add the new item to.\n"
@ -496,7 +496,7 @@ DefineEngineMethod(GuiMenuBar, setMenuItemVisible, void, (const char* menuTarget
menuItem->visible = isVisible;
}
DefineEngineMethod(GuiMenuBar, setMenuItemBitmap, void, (const char* menuTarget, const char* menuItemTarget, int bitmapIndex),,
DefineEngineMethod(GuiMenuBar, setMenuItemBitmap, void, (const char* menuTarget, const char* menuItemTarget, S32 bitmapIndex),,
"@brief Sets the specified menu item bitmap index in the bitmap array. Setting the item's index to -1 will remove any bitmap.\n\n"
"@param menuTarget Menu to affect the menuItem in\n"
"@param menuItem Menu item to affect\n"

4
Engine/source/gui/editor/guiParticleGraphCtrl.cpp
View file

@ -40,7 +40,7 @@ ConsoleDocClass( GuiParticleGraphCtrl,
GuiParticleGraphCtrl::GuiParticleGraphCtrl()
{
for(int i = 0; i < MaxPlots; i++)
for(S32 i = 0; i < MaxPlots; i++)
{
mPlots[i].mGraphColor = ColorF(1.0, 1.0, 1.0);
VECTOR_SET_ASSOCIATION(mPlots[i].mGraphData);
@ -140,7 +140,7 @@ void GuiParticleGraphCtrl::onRender(Point2I offset, const RectI &updateRect)
ColorF color(1.0f, 1.0f, 1.0f, 0.5f);
pDrawUtil->drawRectFill(updateRect, color);
for (int k = 0; k < MaxPlots; k++)
for (S32 k = 0; k < MaxPlots; k++)
{
// Nothing to graph
if ((mPlots[k].mGraphData.size() == 0) || (mPlots[k].mHidden == true))

2
Engine/source/gui/editor/guiShapeEdPreview.cpp
View file

@ -42,7 +42,7 @@
static const F32 sMoveScaler = 50.0f;
static const F32 sZoomScaler = 200.0f;
static const int sNodeRectSize = 16;
static const S32 sNodeRectSize = 16;
IMPLEMENT_CONOBJECT( GuiShapeEdPreview );