Commit graph

422 commits

Author SHA1 Message Date
Areloch c23c99dbea Merge pull request #2118 from Areloch/MenuAndPopups
Refactors the Popup menus and GuiMenuBars
2018-01-27 18:41:00 -06:00
Areloch fad103e4b1 Merge pull request #2126 from Areloch/FixComponentEditorDisplay
Fixes the inspector/component editor to display components
2018-01-10 13:12:35 -06:00
Areloch f43bb6b565 Merge pull request #2059 from Bloodknight/SaharaUndo
#define AUTOPAINT_UNDO
2018-01-10 09:47:24 -06:00
Azaezel 01f0d5cfca tAlgorythm fed namespace T3D for better library interoperability. resulted in the need to specify usage in... a few places. 2017-12-27 22:57:47 -06:00
Areloch b5277e0f08 Fixes the inspector/component editor to display the components attached to an entity correctly in the inspector. 2017-12-03 01:21:30 -06:00
Areloch 2ca6af8e48 Refactors the Popup menus and GuiMenuBars to remove unneeded duplication and platform-specific/deprecated code. 2017-11-11 01:21:48 -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 7f134ed76e Merge pull request #2096 from Areloch/GetCursorPosLocal
Adds a function to get the cursor position in local coords
2017-10-26 02:42:03 -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 4ea3c90b5b Adds a function to get the cursor position in local coords 2017-10-15 04:02:43 -05:00
Areloch b5dfdf1fbb Adds functionality to automate convex proxy objects for appropriate types. Instead of having to manually convert a zone or portal or occlusion volume to convex to edit it's shape, then back again, simply entering the convex editor will automatically convert them to proxy convex shapes, with a special material to denote them.
When the convex shape editor is exited, it converts them back to their original type, with the changes made to the proxy convex applied to them.
2017-10-12 01:41:27 -05:00
Areloch 6479c7592a Merge pull request #2088 from Areloch/EditorTool
Initial implementation of the EditorTool class and world editor hook-in.
2017-10-11 12:00:21 -05:00
Areloch e023cf3a60 Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -05:00
Areloch f9b7f66571 Merge pull request #2089 from Areloch/VariableInspectorRefactor
Updates the VariableInspector, VariableGroup and VariableField objects
2017-09-27 15:31:26 -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 629a25185d Updates the VariableInspector, VariableGroup and VariableField objects to actually be useful. In addition to the original functionality of being able to have a var name passed in and search for all vars with that in it, it also lets you build out a completely custom Inspector.
Unlike the regular Inspector, which requires a specific object or objects, from which the fields are pulled from, this lets you manually create fields, which can tie into any given object and their fields, global vars, and also not only supports the engine types for fields, but also triggers a callback to script if a field type is not found allowing fully custom fields to be handled as needed.
2017-09-21 02:49:36 -05:00
Areloch bc898e1150 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
Areloch f8702b717b Sets the default grid snap size to 1 rather than 10. 1 Seems like a more neutral default value, and also makes it match the displayed '1' in the UI interface as the default as well. 2017-09-17 18:24:44 -05:00
Marc Chapman 4df27e2109 Merge branch 'feature/SaharaUndo' into SaharaUndo 2017-07-30 11:26:21 +01:00
Marc Chapman 9d547537fd canvas -- Added a way for a child control to handle an event but still have GuiCanvas::processInputEvent() return false, therefore allowing the event to also be handled by the ActionMap. (see DemoGame::processInputEvent()) . Also added methods for clearing "down" status of mouse buttons in cases where ActionMap grabs the mouse for dragging and masks the up events from GuiCanvas.
fade-gui-ctrl -- adds fading capability to GuiControl.
2017-07-26 22:20:43 +01: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
Areloch edd1e0a270 Removes Direct3D9 functionality. 2017-05-28 16:51:31 -05:00
Areloch 124ecb2fe0 Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Masquara 15f67015d3 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch ed14b6fced Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Azaezel f1d315d51a adds an atGizmo option - for now drops a new object at a given singular mesh position. TODO: at the center of a given group. 2017-02-26 18:34:32 -06:00
Azaezel 1458494b2a applies mUseGroupCenter checks across the board 2017-02-22 15:49:26 -06:00
Azaezel ebdd441833 adds a useGroupCenter var/button to allow folks to use non-itterative snapping, and defaults it to do so (maintains prior functionality envelope) 2017-02-22 14:31:26 -06:00
Azaezel 7d2315c781 sets snap to grid to itterate through selected objects and settle them into the nearest (seected value), ie 1, 2.5, 3.33 ect. 2017-02-22 00:36:53 -06:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Areloch 0c6174b045 Merge pull request #1920 from elfprince13/variadicConsoleTemplates
Variadic console templates
2017-01-12 23:32:03 -06: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
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Anis 55b7a8431c Merge pull request #1800 from Azaezel/andOrMaybe
clang reports: unclear || + && and &+| mixes.
2017-01-07 02:31:05 +01:00
Thomas "elfprince13" Dickerson 88106f9032 Fixed type inference for nulls in console functions 2017-01-06 17:18:37 -05:00
Anis d164781329 Merge pull request #1829 from irei1as/patch-1
Adding depth option to the texture of guiOffscreenCanvas
2017-01-02 11:52:36 +01:00
Azaezel d42b1a6be8 colorPicker/swatch srgb display.
dependency from @rextimmy: tolinear and togamma for color+lumnance.
2016-12-22 06:37:34 -06:00
Azaezel dd071484da Merge branch 'development' of https://github.com/GarageGames/Torque3D into andOrMaybe
Conflicts:
	Engine/source/T3D/staticShape.cpp
2016-12-20 22:50:28 -06:00
Areloch eb2d3a908a Tweaked the naming convention to a) be more in line with the prefab creation functions, and b) avoid common artist terminologies that may lead to confusion on what it does. 2016-12-11 23:02:13 -06:00
Areloch 1d754cbbad Makes it so prefabs can correctly 'export to collada' by running the buildPolyList function on it's children.
Also adds a 'Bake Selection to Mesh' option to the tools menu in the editor to export the selected mesh to a collada file, and then replaces the selection with a TSStatic.
2016-12-10 17:27:27 -06:00
Azaezel 2652f9a609 Fills out the automaticly filled inspector entries for AbstractClassRep::FieldFlags::FIELD_ComponentInspectors with a pressable button. 2016-12-01 01:07:53 -06:00
Areloch 48610d2eb1 Merge pull request #1773 from Areloch/findByObjectFix
GuiInspector's findByObject method fix.
2016-11-23 00:30:55 -06:00
irei1as a7952bfe1d Add a fix to the depth for the target texture
Fix to the named texture to have the 3d depth correctly rendered if a 3d view is inside the guiOffscreenCanvas.
It's disabled by default so it shouldn't change anything to projects that use guiOffscreenCanvas without the texture (like Oculus rendering).
2016-11-22 16:30:29 +01:00
irei1as 8b43ff3465 Update guiOffscreenCanvas.h
Variables to add depth in the .cpp file.
2016-11-22 16:20:18 +01: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
Azaezel cc9955e102 unused variable cleanup 2016-10-14 17:49:56 -05:00
Azaezel c57b1a8b70 clang reports: unclear || + && and &+| mixes. 2016-10-14 17:26:13 -05:00
RexTimmy dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
Areloch af2ac4472e renames the engine method arg to avoid name confusion. 2016-09-14 19:42:05 -05:00
James Urquhart 212ac36cc1 Tidy up indentation in openvr changes 2016-09-11 22:51:00 +01:00
James Urquhart 1198932e87 Basic fix for reflections in both stereo rendering modes 2016-09-11 22:42:42 +01:00
James Urquhart fa7697b13e Fix debug draw in SBS mode & reflection update timing 2016-09-11 22:42:42 +01:00
James Urquhart 784f6f92d8 Fix lens flare in side-by-side view 2016-09-11 22:42:42 +01:00
James Urquhart 694dd4abfa Fix stack overflow 2016-09-11 22:42:42 +01:00
James Urquhart 734688ff7e Implement basic keyboard & mouse support for openvr overlays 2016-09-11 22:42:42 +01:00
James Urquhart f91aa639d6 Remove projection offset, add the hmd head matrix. Also tidy up a few things. 2016-09-11 22:42:42 +01:00
James Urquhart da6bcbeb2b Improvements to openvr code
- Overlays are implemented (sans input for the moment)
- Fixed a problem where the movemanager was using the wrong values for hmd rotation & position
2016-09-11 22:42:42 +01:00
James Urquhart 9f49a7844e Use correct multiplication order for eye transform. Also fix displayDevice not set bug. 2016-09-11 22:42:42 +01:00
James Urquhart 9e5eda9a08 More progress
- Fixed normal stereo rendering
- Beginnings of vr overlay code
2016-09-11 22:42:42 +01:00
James Urquhart 36908b0434 Add code to render the basic stereo view fallback 2016-09-11 22:42:42 +01:00
James Urquhart ba91478fad Baseline working openvr code 2016-09-11 22:42:42 +01:00
James Urquhart 3dc2100765 Ignore alpha when rendering debug texture 2016-09-11 22:42:42 +01:00
James Urquhart 64b751a7c8 Basic port of code 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
Marc Chapman 56691e1f62 Added undo define and checks 2016-07-29 17:14:59 +01: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
Areloch 95e4d99bb6 Merge pull request #1675 from Azaezel/guiBitmapColoration
adds bitmap coloration to:
2016-07-06 20:10:16 -05:00
Areloch b3adaf7f96 Merge pull request #1672 from Areloch/SDLPopupMenus
Sdl popup menus
2016-07-06 13:17:23 -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
Areloch 818b617972 Implements the right-mouse popup menus in the editor in SDL to make it match to Windows. 2016-07-04 16:01:49 -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 db41a0b30f Merge pull request #1548 from Azaezel/alphamaskedButtons
alpha masking for buttons. original attribution @dottools
2016-06-08 02:04:42 -05:00
Areloch fdbf183382 Merge pull request #1623 from blackwc/GuiTheoraCtrl-loop
add loop playback to GuiTheoraCtrl
2016-06-07 13:56:22 -05:00
Areloch 6ec899620d Tweak to the Component Fields to properly refresh the group. 2016-06-02 23:57:46 -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 74a2005d15 Fixes mistake where GuiInspectorEntityGroup's onAdd doesn't explicitly return true, which can cause problems in some compilers. 2016-05-30 02:29:20 -05:00
Areloch 510b726f6f Final Linux compliance changes(renames, tweaks for gcc compliance, etc) 2016-05-29 00:58:02 -05:00
blackwc fd715f3ef3 add loop playback to GuiTheoraCtrl 2016-05-27 02:22:39 -04: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
Areloch 9bc87709ab Merge branch 'RotationFPR_Cleaned' of https://github.com/Areloch/Torque3D into development 2016-05-12 23:35:21 -05:00
Areloch 95ae0b9863 Removes the old component code and moves the IProcessInput interface file into platform/input/ directory. 2016-05-12 23:31:15 -05:00
Areloch 383d27f2ec The class is designed as a general-purpose rotation/orientation class to make it easy to work with rotations and swap between math types as easily as possible. 2016-05-12 00:45:16 -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
Areloch 6a40b8bb84 Merge pull request #1559 from rextimmy/dx11_clean
Direct3D11 Support
2016-03-29 00:51:23 -05:00
Anis 935bddca35 Merge pull request #1556 from Azaezel/splineSpelunking
Path editor display augmentations.
2016-03-22 12:57:49 +01:00
rextimmy 41e5caf22b Direct3D11 Engine/source changes 2016-03-20 21:52:11 +10:00
Azaezel 76228f2d0c alpha masking for buttons. original attribution @dottools 2016-03-09 20:02:39 -06: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 9acf487f03 Merge pull request #1332 from Azaezel/guiRelativeYresizes
initial aspect ratio maintaining relative gui scaling
2016-02-19 00:46:20 +01:00
Anis 6f47cb7dfa Update guiControl.h 2016-02-19 00:34:07 +01:00
Anis df283a2709 Update guiTypes.cpp 2016-02-18 23:33:46 +01:00
Anis 3ca67b3148 Update guiTypes.h 2016-02-18 23:32:19 +01:00
Anis c4590f6e3d Update guiTextEditCtrl.cpp 2016-02-18 23:30:09 +01:00
Areloch ff2df5c43f Merge pull request #1478 from Areloch/VolFog2
Volumetric Fog Take 2
2016-01-15 11:22:25 -06:00
Robert MacGregor d6226a71ca Fix NULL pointer deref crashes in WorldEditor::selectObject & WorldEditor::unSelectObject 2015-12-02 01:47:29 -05:00
Areloch a90eb9762b Re-submission of the Volumetric Fog PR, with cleanup. 2015-12-01 00:10:13 -06:00
Areloch dbe870f8e5 Merge pull request #1433 from Azaezel/CommandControl
The TypeCommand type brings up a full notepad-esque interface.
2015-11-13 00:31:22 -06:00
Areloch 1a009d6dd3 Merge pull request #1443 from Areloch/TAM_Implementation
TAML, Assets and Modules implementation
2015-11-12 23:54:27 -06:00
Azaezel 1c23583fba world editor spline lerp display. advancedist controls size between steps. highlighted the tip of the arrows 2015-11-02 15:12:49 -06:00
Areloch 165cdb64e9 Merge pull request #1322 from Areloch/String_isEmpty_Convert
Replace uses of dStrIsEmpty with new String::isEmpty
2015-10-31 23:40:13 -05:00
Areloch 7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems.
Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
Azaezel ad5a7dfe0b The TypeCommand type brings up a full notepad-esque interface.
http://i.imgur.com/fB44GBl.png
2015-10-06 17:00:07 -05: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
Areloch b1d2ba8412 Merge pull request #1379 from Azaezel/C4189
C4189 warning cleanups
2015-09-02 19:46:28 -05:00
Areloch b54f41e36d Merge pull request #1378 from Areloch/PVS_Cleanup_595
Properly testing pointer vars aren't null before using them.
2015-08-22 23:17:43 -05:00
Azaezel 8f8c17e997 optimization 2015-08-21 03:07:41 -05:00
Azaezel 240219c423 clarify var-usage via naming 2015-08-21 03:06:47 -05:00
Areloch b614d87e78 Fixes the menubar functionality when using SDL.
This resolves menu order, cleanup and close/re-open issues, as well as crashes on close.

It also modifies the look slightly to look closer to the windows menubar to keep a cohesive look regardless of platform.
2015-08-04 22:57:25 -05:00
Azaezel 555610f69f Addresses roughly half of the C4189 errors though the following methodologies:
1) truly unused vars removed
2) vars leading to remmed out code for debugging remmed in turn.

left out:
vars in macros.
2015-07-29 03:03:27 -05:00
Areloch 3a18819e1e Issue found by PVS Studio:
Several instances where we utilize a pointer variable without properly testing that they aren't null first.
2015-07-28 23:25:09 -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
Daniel Buckmaster d268199f4f Merge pull request #1339 from Areloch/Remove_Demo_Mode_Checks
Remove demo and trial checks
2015-07-23 20:33:31 +10: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
Daniel Buckmaster c2e5dc3345 Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development
Conflicts:
	Engine/source/T3D/shapeBase.h
2015-07-17 16:55:12 +10: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
Daniel Buckmaster 86e0e67496 Merge pull request #1352 from Areloch/PVS_Cleanup_807
Unnecessarily repeated expressions
2015-07-16 15:45:32 +10:00
Areloch 5c688260d5 Issue found with PVS-Studio:
Many places utilize post-incrementation with iterators, but it's better performance to use pre-incrementation.

Resolved by changing the iter++ instances to ++iter;
2015-07-13 23:08:17 -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
Areloch 0d6768d57b Removing stuff pertaining to demo modes and trials, as they're redundant now. 2015-07-01 23:36:56 -05:00
Lopuska 03109c9d6d Color Picker 2015-06-24 20:36:30 -05:00
Azaezel 138d34e31c renames for clarity: relativeToYL changed to aspectLeft ect. also by request, vertsizing options for down the line when mobile is supported.. 2015-06-24 17:18:36 -05:00
Azaezel 6b0c6ae8ac adds 3 new horizontal relative gui entries for dealing with swapping elements between 4:3 and 16:9 aspect ratios. "relativeToYL" maintains the initial aspect ratio, keeping the leftmost edge the same, "relativeToYR" also shifts it so the right hand side is shifted over so that edge would match, and "relativeToYC" takes/adds space from both sides 2015-06-24 14:26:23 -05:00
James Urquhart efc47ed757 Basic fix for stereo rendering without a display device 2015-06-21 20:59:41 +01:00
Areloch 6e8fa7215a Moves from using dStrIsEmpty to the new String::isEmpty static function. Keeps things cleaner, consistent, and works with intellisense. 2015-06-06 17:40:49 -05:00
James Urquhart 3a457749ec Oculus VR DK2 Support
- Updated to work with 0.5.x SDK
- Uses Oculus Rendering rather than PostFX
- Stereo rendering refactored so more rendering info is grabbed from the DisplayDevice
- Implements an Offscreen Canvas for in-game gui with oculus
- Message dialogs and metrics display can now go to the OffScreen Canvas (if oculus demo is setup correctly)
2015-05-06 23:09:51 +01:00
Areloch 6e681dd82f Merge pull request #1239 from bpay/asan-fixes
Fix errors flagged by address sanitizer
2015-04-16 21:12:21 -05:00
LuisAntonRebollo 17f08e9f86 Fix bug on DefineConsoleMethod GuiCanvas::setVideoMode. 2015-03-14 13:01:05 +01:00
Ben Payne 16af2a126e Add a comment 2015-03-06 15:36:22 -05:00
Ben Payne 01471c9ef3 Fix member function visibility 2015-03-04 19:25:10 -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
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