diff --git a/Engine/source/core/resource.h b/Engine/source/core/resource.h index ad5c81e59..383a5ca60 100644 --- a/Engine/source/core/resource.h +++ b/Engine/source/core/resource.h @@ -194,7 +194,7 @@ template class ResourceHolder : public ResourceHolderBase { public: ResourceHolder(T *t) : ResourceHolderBase(t) {} - virtual ~ResourceHolder() { delete ((T*)mRes); } + virtual ~ResourceHolder() { mRes = static_cast(mRes); SAFE_DELETE(mRes); } }; // Resource template. When dealing with resources, this is the diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.tscript b/Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.tscript index 51552e141..239c76a80 100644 --- a/Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.tscript +++ b/Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.tscript @@ -182,7 +182,7 @@ singleton ShaderData( ThickLineGUI ) DXGeometryShaderFile = $Core::CommonShaderPath @ "/fixedFunction/thickLineG.hlsl"; DXPixelShaderFile = $Core::CommonShaderPath @ "/fixedFunction/thickLineP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/fixedFunction/gl/colorV.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/fixedFunction/gl/thickLineV.glsl"; OGLGeometryShaderFile = $Core::CommonShaderPath @ "/fixedFunction/gl/thickLineG.glsl"; OGLPixelShaderFile = $Core::CommonShaderPath @ "/fixedFunction/gl/thickLineP.glsl"; diff --git a/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/thickLineV.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/thickLineV.glsl new file mode 100644 index 000000000..63113fbc1 --- /dev/null +++ b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/thickLineV.glsl @@ -0,0 +1,39 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- +#include "../../gl/hlslCompat.glsl" + +in vec4 vPosition; +in vec4 vColor; + +uniform mat4 modelview; + +out VS_OUT { + vec4 color; +} vs_out; + + +void main() +{ + gl_Position = tMul(modelview, vPosition); + correctSSP(gl_Position); + vs_out.color = vColor; +}