Commit graph

422 commits

Author SHA1 Message Date
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
Ben Payne 62fa40380b Fixes for "incomplete type" errors when compiling with clang-cl 2015-03-04 19:10:56 -05:00
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Daniel Buckmaster 33fcc59543 Merge remote-tracking branch 'origin/style-cleanup' into development
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
2015-03-01 22:30:22 +11: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 dd46e800eb Fixed spelling errors
Fixed spelling errors.
2015-02-12 14:14:10 -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 4f87422392 Added console method docs and removed function
Added a ton of console method documenation and removed
getSelectionCentroidText when you can just use a Point3F as the return
type.
2015-02-02 16:27:03 -08:00
Nathan Bowhay 1ce846d235 add & delete object documentation
added add & delete object console method documentation.
2015-02-02 16:07:15 -08:00
Nathan Bowhay 72a0aed154 Some small console method docs
Added a little documentation to a console method.
2015-02-02 16:04:50 -08:00
Nathan Bowhay 105c2b68f7 Removed unused code
removed some unused code.
2015-02-02 15:55:07 -08:00
Nathan Bowhay c85b5b9999 Fixed odd callback bugs
Fixed bugs with callbacks, I couldn't seem to use U8 correctly in script
for some reason, but S32 works. I may have needed to use some extra
operators or something maybe, it was so long ago I can't remember what I
got in script as it was so long ago.
2015-02-02 15:54:01 -08:00
Nathan Bowhay 2458ecad9b Fixed bug with bad index
Fixed a crash that would occur if an incorrect index was passed to
renderNodeName or renderNodeAxes.
2015-02-02 15:48:05 -08:00
Nathan Bowhay f039c98f08 Fixed bug with dash character in menu item
Fixed a bug where if the text for a menu item started with - then it
would auto be disabled.
2015-02-02 15:46:26 -08:00
Nathan Bowhay ae706b2407 Removed unused parameters
I am not sure why there were parameters for this method when they
weren't being used (perhaps leftover from before?), but I removed them.
2015-02-02 15:40:51 -08:00
Nathan Bowhay 881f9abeb6 Added console method docs
Added more console method documentation and made parameter names more
descriptive.
2015-02-02 15:39:11 -08:00
Nathan Bowhay dd9b788ab4 More console method docs
More documentation for console methods in doxygen format.
2015-02-02 15:31:38 -08:00
Nathan Bowhay a6510190bb Added a bit more documentation
Added a little more documentation to some console methods.
2015-02-02 15:30:07 -08:00
Nathan Bowhay d0972c9be1 Small crash fix
Crash fix when font isn't set.
2015-02-02 15:27:56 -08: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
Nathan Bowhay 789cc47b67 Fixed null profile crash
If the profile was null it would crash.
2015-01-29 15:58:41 -08:00
Nathan Bowhay fe544597e3 onScroll not always called
onScroll callback wasn't always being called, fixed that.
2015-01-29 15:52:10 -08:00
Nathan Bowhay 1903413a54 Removed unused variables
Removed unused variables.
2015-01-29 15:48:11 -08: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
Daniel Buckmaster 0605f056e3 Fix changes to moveSelection API. 2015-01-28 21:25:15 +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
Luis Anton Rebollo 6492028bb2 Merge pull request #1035 from bpay/memfixes
Memfixes
2015-01-25 13:42:32 +01:00
LuisAntonRebollo 4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo 475f218bcd Modified files for SDL2. 2015-01-18 22:52:29 +01:00
Daniel Buckmaster f1da30f285 Those are ints, not floats. 2015-01-02 19:38:05 +11: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 04ff04a95f Removed some unneccessary changes and made file name consistent. 2014-12-21 21:25:27 +11:00
Daniel Buckmaster 03f71a78c0 Added dStrIsEmpty and replaced some incorrect string comparisons. 2014-12-21 21:25:19 +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
Daniel Buckmaster 33ff180593 Merge branch 'development' into style-cleanup
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
2014-12-15 12:15:55 +11:00
Ben Payne 2fc1ac4816 Fix uninit vars in gui 2014-12-11 17:25:02 -05: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 07b0ea9ca6 Merge pull request #927 from BeamNG/setupgenericshader
Add GFXDevice::setupGenericShader for fix render on non FFP.
2014-11-30 02:22:13 +01:00
LuisAntonRebollo 1c95ce21d6 Merge pull request #608 from BeamNG/use_gfxdevice_setupgenericshaders
Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
2014-11-30 02:20:00 +01:00
Daniel Buckmaster 4769bba003 Merge pull request #958 from skaughtx0r/Fix-GuiTreeView-buildVisibleTree
Fix gui tree view build visible tree
2014-11-23 15:52:31 +11: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
Daniel Buckmaster 3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11: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 f6d54d810b Improve documentation on getCursorPos and fix cursorInControl. 2014-11-02 07:51:03 +11: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
Daniel Buckmaster 346ad5bdaa Finished up splash screen implementation.
* Added stub methods for non-Windows platforms
 * Move canvas show to after tools have loaded
 * Fix a tab
2014-08-16 11:28:53 +10: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
Areloch 0878f005c0 Fixed the pure virtual function to be an empty one, which should resolve the linux build failure.
Also tweaked the loading methodology to have the canvas by default assume it should force the window display as soon as it can. You can set the canvas to not do that when it's created via the new displayWindow variable.

This way, old templates and projects should work as normal without changes, while the new templates are built to take advantage of the nicer splash screen arrangement.
2014-08-04 21:28:36 -05:00
Areloch c2da67d473 Fixes the splash screen so that it displays until the game has actually done initial setup and can display GUI elements. This prevents the ugly blank window just sitting there while the GUI loads. 2014-07-15 17:44:19 -05:00
Daniel Buckmaster cf5d48e6ef Merge pull request #665 from andr3wmac/multiformat
Support for large lists of shape formats.
2014-07-08 14:14:54 +02:00
Daniel Buckmaster b94679aebc Prevent call to dStrlen(NULL). 2014-06-17 16:01:25 +10:00
Daniel Buckmaster feec36731e Merge pull request #594 from LuisAntonRebollo/unit-tests-without-crash
Increased stability Torque3D: unit-tests running without a crash.
2014-06-16 10:57:04 +10:00
LuisAntonRebollo a90be04041 Merge pull request #687 from eightyeight/procedural-terrain-coverage
Add coverage option to procedural terrain generator
2014-06-15 11:31:40 +02: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
Daniel Buckmaster de6e5e20b7 Fix random number generation. 2014-06-09 22:59:16 +10:00
Daniel Buckmaster 05e6fbf3d6 Merge remote-tracking branch 'JackDavidson/master' into procedural-terrain-coverage 2014-06-09 21:43:57 +10:00
LuisAntonRebollo 18ba0646c0 Increased stability Torqu3D: unit-tests running without a crash. See the console.log after ran unitTest_runTests( "", true ). @signmotion 2014-05-25 16:50:19 +02:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02:00
Andrew Mac eb74525a38 Added support for large lists of shape formats. Needed for assimp. 2014-05-21 14:50:44 -03:00
bank 69dbaf5b85 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShape 2014-05-13 14:08:42 +04:00
bank 2112c81446 Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSSkinMesh 2014-05-13 12:45:42 +04:00
bank e2545c359c Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSMesh 2014-05-13 12:43:01 +04:00
Daniel Buckmaster 1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency
Platform type consistency
2014-05-10 11:40:40 +10:00
Daniel Buckmaster a42c92391a Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None
Rename enum GFXTextureProfile::None for avoid conficts on Linux.
2014-05-10 11:01:18 +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
bank 68b12981ae Fix: dSprintf should receive size of the buffer, not the size of the pointer.
It was safe, as we are using static console return buffer,
which is large enough to hold enough data (default is 2048).
2014-05-06 12:40:45 +04:00
JackDavidson 060b2a4e29 Commit to add "Coverage" option to procedural terrain generator
This commit adds a "Coverage" option to the procedural terrain
generator. Allows mixing of textures. See
http://www.garagegames.com/community/blogs/view/22371 for more info.
This version has many improvements - coverage is now entered as a
percentage, accepts decimals, and doesn't have any bugs as far as I
know.
2014-05-04 22:17:24 -07:00
LuisAntonRebollo 33742599b3 Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
OpenGL and DirectX11 not support FFP, and GFDevice::disableShaders has not the necessary information to decide the shader to be used.

GFDevice::SetupGenericShaders is used instead of GFDevice::disableShaders.

GFDevice::disableShaders will be deprecated on T3D 4.0
2014-04-13 17:57:40 +02: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 382569ccb5 Merge pull request #584 from klaussilveira/master
Copy of PR #551 changed to target development.
2014-03-17 09:07:35 +11:00
Cameron Porter 91c058ca8a When setting the field on a GuiInspectorField, check if the field is null before setting the docs. 2013-12-10 23:42:07 -06:00
Klaus Silveira 0d610b7aac Fixed missing check for highlighted font color on GUI icon button 2013-12-08 01:19:42 -02:00
SilentMike ef4cee7b17 Merge pull request #466 from eightyeight/mltext-default-reformat
Added default parameter to GuiMLTextCtrl::addText
2013-10-26 11:24:08 -07:00
DavidWyand-GG 2fc5adb536 PlaneReflector Support for Side-by-Side Rendering
- The PlaneReflector class now supports side-by-side rendering.  This
does mean that while in this rendering style that all planar reflections
are rendered twice, as reflection is a screen space effect from the eye
point of view.
- Planar reflections now work in the Oculus Rift.
- Modified GuiTSCtrl::onRender() to move up where the rendering style is
defined to just before the reflection manager has its turn.
2013-10-25 02:08:13 -04:00
Daniel Buckmaster dbb15ccf0b Reformat parameter defaults to true. 2013-08-13 14:36:06 +10:00
SilentMike 77bd934167 Merge pull request #424 from tdev/lock-checking
Added checks for valid pointers after locking
2013-08-11 22:14:16 -07: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
Bloodknight 3d38dc60eb Increase terrain editor and painter max brush size to 256 x 256 2013-07-28 02:26:29 +01:00
Thomas Fischer 53abbe066d added checks for valid pointers after locking 2013-06-30 17:51:38 +02:00
David Wyand 2dcc7f0247 Merge pull request #310 from thecelloman/goodbyeDIF
Remove Interior Object format (DIF)
2013-04-20 13:44:11 -07:00
SilentMike a9643a448d Merge pull request #327 from thecelloman/smoothslope
Add a new Terrain brush action:  Smooth Slope.
2013-04-10 14:47:09 -07:00
thecelloman 8eb0e98f86 Add a new Terrain brush action: Smooth Slope.
This smoothes the terrain using a linear regression algorithm.  Exists alongside the oldstyle height averaging action -- options are good!
2013-04-10 08:44:22 -04:00
DavidWyand-GG b32e7688c2 Side by side rendering
- Side by side rendering implemented throughout the graphics pipeline.
- New GuiTSCtrl renderStyle property is set to "stereo side by side" to
activate.
- You set an IDisplayDevice on the GameConnection to define any vertical
FOV, projection offset, and stereo eye offset properties required for
the stereo rendering (no display device included with this commit).
- Full and Empty templates updated with correct scripts and shaders.
2013-04-09 15:19:18 -04:00
DavidWyand-GG 0d77cdc270 GFX now handles non-default adapters
The GFX (DirectX) pipeline did not respect the choice of adapter and
always went for the default one.  Normally this isn't an issue unless
you wish to target a particular adapter and display device combination.
This has been corrected.

The GFX initialize functions now attempt to find the best adapter that
matches a given display device (i.e. monitor) if one has been passed in.
To aid with choosing a display device some new monitor enumeration
methods have been added to the platform window manager.  These methods
have been exposed to the Canvas.
2013-04-09 12:50:17 -04:00
thecelloman b4ea1123dc Remove Interior Object format (DIF) 2013-04-05 12:39:26 -04: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
thecelloman 1468a049af Filling out the variable names in the function prototype for autoMaterialLayers() for clarity.
Minor whitespace formatting changes (spacing) for consistency.
2013-03-22 15:02:45 -04:00
thecelloman 25efdb4a06 Adding a basic rule-based terrain painting implementation.
http://www.garagegames.com/community/resources/view/17145
2013-03-21 17:45:23 -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 2824bcf649 Remove hard coded paths pass 1
- displaySplashWindow() now takes an optional path to a bitmap file.
- Missing, unavailable and warning texture paths now come from
GFXTextureManager static methods.
2013-01-30 14:09:23 -05:00
DavidWyand-GG 32a3bab2f7 Moved platform input event files under new input directory 2013-01-23 02:37:37 -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
DavidWyand-GG 59aaaf1892 Merge branch 'consolefuncrefactor' of https://github.com/jamesu/Torque3D into consolefuncrefactor 2013-01-07 12:09:22 -05:00
DavidWyand-GG 2a6a177fa1 Fix for Issue #138 for guiArrayCtrl Fix 2012-11-08 18:34:24 -05:00
DavidWyand-GG c6b6ffc10b For for Issue #106 Convex Shape Bandwidth 2012-11-05 14:27:30 -05:00
DavidWyand-GG 497f3c96dc Fix for Issue #90 for Camera orbit object bug 2012-10-16 18:43:11 -04: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
David Wyand b211edb5e2 Fix for Issue #64 for GuiTabBookCtrl rendering 2012-10-04 17:36:15 -04:00
David Wyand 8f75a228f7 Fix for Issue #62 for Large decal disappears 2012-10-04 16:38:49 -04:00
bank d2700f881c Source changes needed for Linux build. 2012-09-23 15:31:56 +04:00
DavidWyand-GG 7dbfe6994d Engine directory for ticket #1 2012-09-19 11:15:01 -04:00