TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-31 01:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4572 commits 5 branches 33 tags 958 MiB
Commit graph

152 commits

Author SHA1 Message Date
Azaezel c875f44bd1 clarified several variable 'r' definitions, as well as a doubleup of a sucessive S32 txt_w = mProfile->mFont->getStrWidth( buff ); pair 2018-03-12 16:00:10 -05:00
Glenn Smith 47d5b6ead7 As suggested, extract strlen calls from sizes into variables so it isn't called twice 2018-03-08 20:59:40 -05:00
Glenn Smith d9a723d533 More cats and cpys in files that xcode doesn't see 2018-03-07 01:13:56 -05:00
Glenn Smith 79c34c68db Use strncpy instead of strcpy because again, buffer overflows 2018-03-06 02:35:33 -05:00
Glenn Smith 7769da9434 Use strncat instead of strcat to prevent some buffer overflows 2018-03-06 00:48:44 -05:00
Areloch 5bf3d56a05 Addition to guiTreeViewCtrl - ability to find what item in the tree is under a given position. 2018-01-28 15:07:50 -06:00
Areloch a36192ffd8 Makes it properly force an update of the filter via a dirty flag. 2017-10-26 20:11:35 -05:00
Areloch 526d4ea31a Remove unneeded isParent handling for entities in the GuiTreeViewCtrl 2017-10-18 00:35:37 -05:00
Areloch 0c21ef1b45 Removes Entity/Component stuff from being behind an experimental flag. 2017-10-15 06:03:59 -05:00
Areloch 9b83e47302 Adds some filtering options to the console log gui so you can specify if you wish to be able to see errors, warnings and regular messages. It also denotes how many errors and warnings are currently in the log. 2017-09-23 12:37:55 -05:00
Areloch 25686ed4be Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Masquara 15f67015d3 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Thomas "elfprince13" Dickerson 27e2871b01 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:36:04 -05:00
Thomas "elfprince13" Dickerson bcc5459818 whitespace 2017-01-11 23:34:46 -05:00
Azaezel d42b1a6be8 colorPicker/swatch srgb display. 
dependency from @rextimmy: tolinear and togamma for color+lumnance.
 2016-12-22 06:37:34 -06:00
Areloch 3ab2f98ec3 Fixes up some erroneous behavior with Simgroup parentage. 
Fixes Prefab creation handling of SceneObjects and SimGroups.
Fixes SceneObjects where the default icon incorrectly defaulted to the simgroup folder rather than the generic class object when the class has no specific class icon.
 2016-10-26 00:49:05 -05:00
Anis 60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2 
more unused variable cleanups
 2016-10-23 21:04:36 +02:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight 
clang: constructor initialization order
 2016-10-19 08:39:12 -05:00
Areloch 121d65215e Tweaks any enums that use uint_max values so that they have hard types to avoid any compiler kerfluffles with C++11 value narrowing, specifically pertaining to clang. 2016-10-17 01:00:12 -05:00
Azaezel 1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Azaezel fbfd3ed8ed clang: constructor initialization order 
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
 2016-10-14 18:16:55 -05:00
James Urquhart 734688ff7e Implement basic keyboard & mouse support for openvr overlays 2016-09-11 22:42:42 +01:00
Azaezel db50887c05 addresses C4101 warnings ('identifier' : unreferenced local variable) 2016-07-31 11:00:37 -05:00
Areloch e79e5eb616 Merge pull request #1608 from irei1as/patch-1 
Set textures as bitmapctrl in script
 2016-07-07 00:16:01 -05:00
Azaezel f8368cd7e9 adds bitmap coloration to: guibitmapctrl, guibitmapbarctrl, guianimbitmapctrl (and guicrosshairhud by way of inheritance) 2016-07-06 02:15:46 -05:00
Areloch 46308aaaa3 Merge pull request #1669 from Azaezel/guiBitmapBarCtrl 
New: GuiBitmapBarCtrl
 2016-07-05 00:22:04 -05:00
Azaezel 01051e4182 new: guiAnimBitmapCtrl - works similar to the particle animation system. feed it x and y for how many frames in a spritesheet, and let her run. 
also supports:
either specific frames, a range to play, or a mix (string)
fps specification, (int)
loop, (bool)
pausing, (bool)
reverse (bool)
 play (bool)
and has callbacks for onLoop, onCompleted, and onFrame (index and actual frame passed along)
 2016-07-04 20:44:42 -05:00
Azaezel 36ec6c1b59 New: GuiBitmapBarCtrl 
clipped bitmap. by default clips the right hand side based on (the percent entry/100).
options:
vertical clips the bottom
flipClip inverts direction (so vertical off would remove bits from the left, vertical on from the top)
 2016-06-30 15:51:03 -05:00
Areloch 89672ea0ab Hooks the component fields back into the inspector so they are registered as proper fields of their types, as opposed to the regular string-only dynamic fields. 2016-06-02 22:40:29 -05:00
Areloch ec8882c3c8 Ensuring all names are the correct casing for Linux 2016-05-26 01:37:14 -05:00
Areloch 04adb9f240 Added a small sanity check so we don't pointlessly throw an error when expanding an Entity's component stack in the scene tree. 2016-05-21 14:44:24 -05:00
Areloch b04ad52b5d Ensure that inclusion of any entity/component stuff is properly bracketed with the preprocessor check. 2016-05-15 10:11:46 -05:00
Areloch 827e70d674 Integration of Entities into the inspector/editor so they can call back into the tool scripts for custom handling. 2016-05-14 14:12:53 -05:00
irei1as 01e3cb53de Set textures as bitmapctrl in script 
A new method to GuiBitmapCtrl in order to set "named textures" as the image displayed in script.
Those "named textures" are created in two places from script (not c++) that I know: as part of GuiOffscreenCanvas (targetName field) and, more useful, as the target of a PostEffect using target = "#name" (the '#' is not used for this method).
 2016-05-11 17:47:05 +02:00
rextimmy 41e5caf22b Direct3D11 Engine/source changes 2016-03-20 21:52:11 +10:00
Anis 87f62c427c removed triangle fan draw on color picker 2016-03-04 22:18:12 +01:00
Azaezel 7a60056365 Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-21 16:07:51 -06:00
Anis 304c33e525 removed tabs 2016-02-21 22:55:45 +01:00
Azaezel bc433e7c30 Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-21 15:31:09 -06:00
Azaezel ca2ffea6cd Merge branch 'development' of https://github.com/GarageGames/Torque3D into ColorPickerAdvanced 2016-02-21 15:30:54 -06:00
Anis 5c2bfbf82e Update guiColorPicker.h 2016-02-21 22:10:17 +01:00
Anis aed2e0b5b6 Update guiColorPicker.cpp 2016-02-21 22:09:14 +01:00
Anis c4590f6e3d Update guiTextEditCtrl.cpp 2016-02-18 23:30:09 +01:00
Azaezel 1d442c9f84 void GuiTextEditCtrl::execConsoleCallback() reversion 
see https://github.com/GarageGames/Torque3D/issues/1408
 2015-09-16 12:55:27 -05:00
Areloch bedc79aacb Merges in Monkey's fixes PR with a resolution for a conflict 2015-09-03 22:58:57 -05:00
Azaezel 2238dd66da From Dušan Jocić: early out of treeview entries to prevent crashes 
"when you change some item or remove, it does not resize the array and in that way it create problem with value"
 2015-07-28 18:35:11 -05:00
Areloch 527c3790d6 Issue found with PVS-Studio: 
Many instances where we would create a object via a new call, and then check that it was non-null.

This is redundant, as if we ever were in a situation where new failed, we'd be crashing left and right already, so the additional check is wasted processing.
 2015-07-21 23:22:21 -05:00
Daniel Buckmaster 4f2f1ca4e1 Merge pull request #1356 from Areloch/PVS_Cleanup_813 
Convert un-modified function arguments to const references.
 2015-07-20 22:55:22 +10:00
MusicMonkey5555 a22672dd7a Update guiConsoleTextCtrl.cpp 
Removed redundant assignment.
 2015-07-17 16:40:39 -07:00
Areloch 11398bb04e Issue found with PVS-Studio: 
A lot of instances where some function args are not actually modified in any way, meaning that it is better for performance to convert them into const references. This prevents an additional copy, which can help performance.
 2015-07-16 22:02:18 -05:00
Areloch 2002d74b78 Issue found with PVS-Studio: 
Many instances of a function or expression being used repeatedly, which can lower performance.

Fixed it in these cases by creating on local var, reference or pointer that's used instead.
 2015-07-13 22:51:17 -05:00
Lopuska 03109c9d6d Color Picker 2015-06-24 20:36:30 -05:00
Ben Payne 16af2a126e Add a comment 2015-03-06 15:36:22 -05:00
Ben Payne bd49fe3cb0 Don't call strncpy when src == dest 
This fixes an error flagged by address sanitizer
 2015-03-04 19:13:53 -05:00
Daniel Buckmaster 6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development 
Conflicts:
	Engine/source/console/console.cpp
 2015-03-01 20:33:29 +11:00
Daniel Buckmaster 497a15cfd0 Merge pull request #1214 from bpay/cppcheck-cleaning 
Fix some issues flagged by cppcheck
 2015-03-01 18:27:40 +11:00
Ben Payne 0ffd7f5620 Fix member vars left uninitialized in constructors 2015-02-20 18:41:51 -05:00
Antony Jones d2d1f6086e Added NULL check in function findItemByName. 
(cherry picked from commit adb2513a2461092486e00b5550bf57fb83d0ccac)
 2015-02-15 11:15:10 -08:00
Dennis Brakhane b580b4a542 return the result value of scrollVisible 
The console function changed from void to bool, so we
should actually return the value.

Also, the missing return is an error in VS2013.
 2015-02-14 17:19:11 +01:00
Daniel Buckmaster 486a12cb96 Merge pull request #1183 from MusicMonkey5555/documentation 
Documentation
 2015-02-14 19:52:37 +11:00
Nathan Bowhay 0a345674ed Fixed spacing issues 
Tabs to 3 spaces.
 2015-02-12 14:46:07 -08:00
Nathan Bowhay 246df9c454 Added parenthesis 
Added parenthesis to avoid turning height into a true/false evaluation
result.
 2015-02-12 08:25:16 -08:00
James Urquhart f44a3f27d6 Fix stack balancing problems by refactoring execution calls 
- Con::executef now uses a template
- All public execution functions now restore the console stack upon return
- Fixed bad parameters on some callbacks
- Reverts get*Arg behavior
 2015-02-08 00:08:18 +00:00
Nathan Bowhay 879dbf0b03 Documented console methods 
Added more documentation to console methods, changed inconsistent or
confusing parameter names.
 2015-02-02 14:59:49 -08:00
Nathan Bowhay 77b9600303 IsActive fix & code cleanup 
Now if a text edit is set to inactive you can't mouse down.
changed code
to use setVariable so code is a bit cleaner.
Fixed some small spacing
issues.
 2015-02-02 13:54:56 -08:00
Nathan Bowhay fbc6bcea20 Added better comments to console methods 
Improved the comments on two console methods so when using them it is
clearer what to expect.
 2015-02-02 12:50:34 -08:00
Nathan Bowhay b11bc8e93a Fixed some positioning bugs 
Fixed some cursor positioning bugs in the MLTextCtrl.

Also removed parameters from function that doesn't actually take
parameters.
 2015-02-02 12:17:38 -08:00
Nathan Bowhay 722008570a Fixed bug with console expression result 
Fixed a bug with the result of a console expression not always
displaying.
 2015-02-02 12:02:56 -08:00
Luis Anton Rebollo cc9be50422 Merge pull request #1121 from bpay/fix-buffer-overflows 
Fix buffer overflows
 2015-02-02 20:15:51 +01:00
Daniel Buckmaster 014b566014 Merge remote-tracking branch 'gg/development-3.6' into development 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
 2015-01-29 21:17:38 +11:00
Ben Payne fcf52fb5e0 Rename the memory allocating versions to make prev error less likely 
The behavior is different enough that these shouldn't be overloaded
with the non-allocating verions. Also makes it more obvious what is
going on to the caller.
 2015-01-26 16:52:06 -05:00
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
Daniel Buckmaster f9cd778b3b Fixed tricky overloaded sfx* functions. 2014-12-24 10:04:44 +11:00
Daniel Buckmaster 3ab048c5b0 Fixes after feedback from Luis. 
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
 2014-12-23 18:48:02 +11:00
Daniel Buckmaster 9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod 
Conflicts:
	Engine/source/T3D/missionMarker.cpp
 2014-12-21 21:23:55 +11:00
LuisAntonRebollo 2f8d18c0c0 Merge pull request #929 from BeamNG/remove_old_opengl_code 
Remove unnecesary code for handle OpenGL.
 2014-11-30 02:22:24 +01:00
LuisAntonRebollo f101fbe820 Remove unnecesary code for handle OpenGL. 2014-11-08 18:11:35 +01:00
LuisAntonRebollo cc16277ce6 Add GFXDevice::setupGenericShader for fix render on non FFP. 2014-11-08 17:59:36 +01:00
Vincent Gee 2f48f31a6f Fixed String comparisons. 2014-11-05 23:29:08 -05:00
Vincent Gee 9907c4592e Fixed bad string compares and simdictionary 2014-11-04 19:51:13 -05:00
Vincent Gee acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
 2014-10-14 15:09:11 +11:00
Scott Przybylski 2987681220 Alternate fix for GuiTreeView 
Adding `mFlags.set(RebuildVisible)` to `GuiTreeView::onWake()` fixes the problem where the tree is not drawn correctly when nodes are expanded in the TorqueScript `GuiTreeView::onWake()` callback function.
 2014-08-14 21:52:48 -07:00
Scott Przybylski e21a0876b6 GuiTreeView bug in buildVisibleTree 
There was a bug in buildVisibleTree, it should be setting the RebuildVisible flag, not clearing it.

The clip rectangle did not appear to be updating when expanding items or calling scrollVisible, which expands all the items to make a particular item visible. This would cause part of the tree to be cut off.

Setting the RebuildVisible flag made the problem go away.
 2014-08-14 00:59:07 -07:00
Daniel Buckmaster b94679aebc Prevent call to dStrlen(NULL). 2014-06-17 16:01:25 +10:00
bank f3fc84738b Use fixed buffer size var when allocating return buffer from console. 
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
 2014-06-11 13:09:55 +04:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes 
Various engine fixes
 2014-05-23 14:09:00 +02:00
Daniel Buckmaster 1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency 
Platform type consistency
 2014-05-10 11:40:40 +10:00
bank 6275942acb Fix GuiTreeViewCtrl: we should use the member var, removed local decl. 2014-05-06 15:39:22 +04:00
bank 6d176cf8db Rename local variable to prevent confusion with member variable. 2014-05-06 15:39:21 +04:00
LuisAntonRebollo 7f46383eb5 Rename enum GFXTextureProfile::None for avoid conficts on Linux. 2014-04-07 00:03:52 +02:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
 2014-04-04 13:43:25 +11:00
Daniel Buckmaster dbb15ccf0b Reformat parameter defaults to true. 2013-08-13 14:36:06 +10:00
cpusci 7a8f46b19f Update for float, double and unsigned char, unsigned short, short, etc. char was left alone: read why here http://msdn.microsoft.com/en-us/library/cc953fe1.aspx 2013-08-04 16:58:59 -05:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
thecelloman 19c685dc23 Resolve issue #193 - Gui Editor treeview now refreshes correctly when changed through a drag/drop operation. 2013-03-27 23:21:25 -04:00
DavidWyand-GG 4b1334db9f Removed hard coded directory paths 
- Removed references to core directory.
- Switch some references to tools directory
- Added preferences variables where appropriate
 2013-03-07 18:56:53 -05:00
DavidWyand-GG 539efcb1e1 Input event changes 
- New InputEventManager class.  It will be used by 3rd party input
devices to generate Torque 3D input events.
- Expanded the input event signal to include three new floats and a new
integer.
- Expanded the number of joystick buttons to 48.
- The input virtual map is now extendable rather than hard coded.
- The input devices types are now extendable rather than hard coded.
- New SI_POS, SI_ROT, SI_INT, and SI_FLOAT input event types.
- New SI_VALUE input action type.
- ActionMap has been updated to work with these changes.
- Removed unnecessary references to platform/event.h
 2013-01-22 18:17:41 -05:00
jamesu 08d4f6ebc0 Improvements to console refactor code 
- Prevent stack corruption in a few places
- Use correct type in printfs
- Reduce type conversions in EngineApi & dAto*
- Fix compilation on GCC
- Tidy up code
 2012-10-12 19:12:06 +01:00
James Urquhart 38c8e52c1d Beginnings of the "pass everything using a native type wrapper" console code. 
- ConsoleValue class is now the base value class.
- ConsoleValueRef is now used to supply function parameters. Values are disposable.
- Script functions return values instead of just strings where possible.
- Variables can be disposable strings
- Bytecode changed

Fix the issues with console method parameters and fields which prevented missions from loading.
 2012-10-12 18:56:17 +01:00