Commit graph

102 commits

Author SHA1 Message Date
Marc Chapman
0b84fccdd2 substitutions -- Implementation of special substitution statements on datablock fields. 2017-07-26 20:18:27 +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
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
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
e6159a590a Add basic support for showing openvr controllers and tracked objects 2016-09-11 22:42:42 +01:00
James Urquhart
ba91478fad Baseline working openvr code 2016-09-11 22:42:42 +01:00
John3
a6dcf6ee09 added path @dottools 2016-08-07 08:06:38 -05:00
Areloch
79358ee4be Fix to include a needed include for the accumulation volume stuffs 2016-08-07 01:35:23 -05:00
Anis
4c59f39c09 Merge pull request #1642 from Azaezel/globalAccumulation
level-wide accumulation assignment
2016-08-07 02:31:45 +02:00
Azaezel
9a4acc8a46 initial assignment cleanup (also shapebase for staticShape et al) 2016-06-20 16:47:01 -05:00
OTHGMars
b5a957dfdc ShapeBase Mounting
Added mount transforms to ShapeBase
2016-06-17 10:36:30 -05:00
Areloch
8d195f9236 Makes the tab/spaces consistent for the entire console method function rather than mix-n-matching the formatting. 2016-05-10 10:58:03 -05:00
Areloch
27bb7a712a Corrects tabs. 2016-05-09 13:47:29 -05:00
Areloch
3a99541541 Select camera when in material editor crashfix.
When attempting to select a camera Object(so going into the editor, going into the freefloating camera and then back to the player camera and selecting the freefloating one) while the material editor was open, it would crash because it attempts to access the shapebase object's shapeInstance - but cameras don't have a shape.

This fixes it so it makes sure there's a shapeinstance before trying to get the material data.
2016-05-09 13:43:06 -05:00
Anis A. Hireche
f701228a37 Steve Acaster's Ai Poses 2016-02-26 15:53:20 +01: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
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
6cbb4d5b16 Merge pull request #1344 from eightyeight/fix-wreorder
Fix -Wreorder warnings from ShapeBase
2015-07-12 15:59:31 +10:00
Daniel Buckmaster
1cb5f0f160 Fixed constructor order in ShapeBase. 2015-05-09 23:06:30 +10: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
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
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
LuisAntonRebollo
4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01: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
Daniel Buckmaster
9622f93d05 Fix weapon image camera shake. 2014-12-07 20:59:17 +11:00
Daniel Buckmaster
d08e594316 Merge pull request #682 from Azaezel/extended_onendSequence
Extended onend sequence
2014-09-16 10:25:25 +10:00
Azaezel
db089ab45f consistency 2014-09-15 19:10:23 -05:00
Daniel Buckmaster
439dc9c56d Fixed ShapeBase animation networking.
We essentially just need to remember to Update ShapeBase::Thread::position
every time we advance the thread in the shape. With a little bit of
supporting code these changes will be passed to the client's shape.
2014-09-15 10:01:13 +10:00
Daniel Buckmaster
69179cf809 Removed ShapeBase::Thread::sound.
Weird feature that's not script-accessible or actually implemented.
2014-09-05 14:09:35 +10:00
Azaezel
11ac92accc adds the name of the sequence just completed for simple FSMs and the like. example usage:
function shapeBaseData::onEndSequence(%this, %obj, %slot, %name)
{
   %script = "on" @ %name;
   if(%this.isMethod(%script))
      %this.call(%script, %obj);
}

function fooData::onDeploy(%this,%obj)
{
   error("fooData::onDeploy" SPC %this SPC %obj);
}
2014-05-30 22:49:17 -05:00
Thomas Fischer
cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02: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
Daniel Buckmaster
1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency
Platform type consistency
2014-05-10 11:40:40 +10:00
bank
b2e6895554 Fix: preload() method on datablocks should always set errorStr when returning false.
Otherwise it will dump the previous error message (content of the errorStr).
2014-05-06 12:40:40 +04:00
Azaezel
8d90558279 removes non-functional shield and invincibility functionality. 2014-04-07 16:11:32 -05: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
Thomas Fischer
502e346eb6 visual studio 2012 Level 4 warning fixes 2014-03-15 11:38:53 +01:00
Andy Maloney
0db6e1bc57 Fix potential crashes
- some compilers have problems with using locally redeclared loop vars after an internal loop
 - fix ordering of conditional checks
2013-12-04 16:50:23 -05:00
cpusci
4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Daniel Buckmaster
ce73a6b11a Exposed blowUp method to console. 2013-08-02 19:00:28 +10:00
David Wyand
2dcc7f0247 Merge pull request #310 from thecelloman/goodbyeDIF
Remove Interior Object format (DIF)
2013-04-20 13:44:11 -07:00
Thomas Fischer
aece85f02a added missing initialization and set pointer to NULL after deletion 2013-04-15 18:54:34 +02:00
DavidWyand-GG
660250cccf Game cam and eye banking, control schemes
- ShapeBaseData has two new properties.  cameraCanBank indicates that
the game object may bank its eye/camera, if supported by the object.
mountedImagesBank indicates that mounted images should bank with the
eye/camera in first person view.  Both default to false.
- Player supports 1st person eye and 3rd person camera banking when
making use of the new ExtendedMove class.
- Camera class supports banking when making use of the new ExtendedMove
class.
- GameConnection now has an idea of a control scheme.  This determines
how game objects should respond to input events.  A control scheme may
be set by either the server or client.  Current control schemes are:
-- Absolute rotation (likely though the ExtendedMove class)
-- Add relative yaw (from mouse or gamepad) to absolute rotation.
-- Add relative pitch (from mouse or gamepad) to absolute rotation.
- Player class supports the new control schemes when using the
ExtendedMove class.
- Camera class supports the new control scheme when using the
ExtendedMove class.
2013-04-09 16:14:19 -04:00
thecelloman
b4ea1123dc Remove Interior Object format (DIF) 2013-04-05 12:39:26 -04:00
thecelloman
7e5ddf4ca2 Resolve issue #163
Fixed and assert on changing material, and we now map the material to the MATMGR by name instead of type.
2013-03-27 21:36:17 -04:00
DavidWyand-GG
47787900a4 Change ShapeBase to only test if available meshes
The ShapeBase class tests if all of its meshes are hidden and if so,
then it doesn't render during that frame.  However, if there are no
meshes in the ShapeBase and only nodes then rendering is also skipped.
Unfortunately, this also skips the rendering of any mounted images.
This change allows for a mesh-less skeleton to render any mounted
images.
2013-02-22 15:24:29 -05:00