Ithasreturned #123

mirv-sillyfish · 2016-06-28T18:00:50Z

GRAPHICS: shader support

Support runtime generated shaders, and shader based rendering of world geometry.
GUI is not rendered using shaders. OpenGL compatibility profile still required for GL3.2
to be used.

DrMcCoy · 2016-06-29T18:19:56Z

src/graphics/shader/shaderbuilder.cpp


-		switch (flags) {
+void ShaderBuilder::addVertexShaderString(Common::UString &header, Common::UString &body, uint32 passType, uint32 blendType, bool isGL3) {


The parameter blendType is unused in this method (and will throw an "unused parameter" warning). Please wrap blendType in the UNUSED() macro to document that it is unused (and silence that warning).

DrMcCoy · 2016-06-29T21:00:58Z

Keep in mind that commit messages should, after the subsystem tag, start with a capital letter and shouldn't end with a period. I.e. it should be "GRAPHICS: Render decals after primary mesh data" instead of "GRAPHICS: render decals after primary mesh data."

Addition of shared mesh and increment/decrement changes to track them.

A shader renderable is really a description of how to render something, so add support for it to modelnode.

Load appropriate index and vertex data into _mesh, suitable for modelnode rendering.

model_nwn now has a defalt shader renderable. It is not not copied when inheriting from a parent node.

ModelNode now takes the parent transform as a parameter to the render function. This is necessary because _absolutePosition is relative to the parent, not the world, coordinates. Updates to switch the projection matrix between 3d perspective and orthogonal has also been included in this commit.

ShaderRenderable now properly increments and decrements component resource counts as they are added or removed.

Add colour support when rendering text using texturefont. This is known to work with NWN, but may break other games.

Use shaders for Jade Empire abfont text rendering. Portraits should really be made to work again soon.

Black borders around portraits supported. Only black. This commit includes rebase fixes for glm transform support.

Use radians when setting a node's orientation, not degrees.

Allow modelnodes to specificy an alpha value even without a valid _mesh component.

Start to use renderImmediate and queueRender over normal render calls to allow per-game shader based rendering easier.

On call to finalize in Model, make sure createAbsolutePosition is called to ensure transformation matrices are up to date.

With Mesa supporting GL3.2 compatibility profiles, update code to render properly on the GL3.2 code pathways.

To avoid affecting working games, create separate render pathway for the shader work. This can be enabled at engine initialisation.

Use old rendering pathways if shaders are not in use. This is incomplete work.

All orientation in degrees, with conversion to radians prior to any call to glm::rotate.

Use command line option --opengl3=true/false to specify if GL3.2 should be attempted or not.

Fix rotation on the shader based rendering path.

Only attempt to plug in raw mesh data if the node is of type mesh for Dragon Age. Actually create rawMesh as well.

Sonic uses an orthographical projection, not a 3d perspective projection, so don't assume 3d perspective in renderWorld.

Always add meshes from KotOR to MeshMan, else they are not freed at program exit.

Suppress excessive development output when loading Jade Empire models.

Delete ABCFont renderable and material properly.

Assign name before passing mesh to MeshMan to have MeshMan accept the mesh and later properly delete it.

Properly save Jade Empire mesh data to MeshMan, so that it's correctly freed later.

Probably a good idea to add created meshes to MeshMan in all cases.

Create rawMesh correctly, and assign data to MeshMan correctly.

Remove outdated material build for Jade Empire that relied on the older shader construction routines.

Remove strings and deprecated shader building system.

Old shader construction code is deprecated, remove it from KotOR.

Remove deprecated shader construction code from The Witcher.

ShaderBuilder is deprecated, and removed.

DrMcCoy reviewed Jun 29, 2016
View reviewed changes

mirv-sillyfish force-pushed the ithasreturned branch from c153598 to 79088f1 Compare July 1, 2016 19:24

mirv-sillyfish force-pushed the ithasreturned branch from fca3beb to eb9986b Compare October 22, 2016 12:54

DrMcCoy mentioned this pull request Oct 22, 2016

move window handling to its own class #121

Closed

mirv-sillyfish force-pushed the ithasreturned branch from eb9986b to 610b921 Compare November 1, 2016 21:45

mirv-sillyfish force-pushed the ithasreturned branch from 610b921 to fddca57 Compare November 23, 2016 19:07

mirv-sillyfish force-pushed the ithasreturned branch from 52adc25 to b42534b Compare December 21, 2016 17:58

mirv-sillyfish force-pushed the ithasreturned branch from c5d73fe to a24bd3b Compare February 26, 2017 20:12

mirv-sillyfish force-pushed the ithasreturned branch from a24bd3b to bc3e1e1 Compare August 1, 2017 22:17

mirv-sillyfish force-pushed the ithasreturned branch from bc3e1e1 to f3b8b52 Compare November 23, 2017 21:30

mirv-sillyfish force-pushed the ithasreturned branch 2 times, most recently from 193e450 to 046c7ec Compare February 13, 2018 23:01

mirv-sillyfish force-pushed the ithasreturned branch from c0ab26b to dc33367 Compare April 12, 2018 14:57

mirv-sillyfish force-pushed the ithasreturned branch from 0a2fd9b to 90b9674 Compare May 13, 2018 19:23

mirv-sillyfish force-pushed the ithasreturned branch from 042e436 to 51e73fc Compare June 7, 2018 22:10

mirv-sillyfish force-pushed the ithasreturned branch from a85d638 to fa3983d Compare June 20, 2018 21:14

mirv-sillyfish force-pushed the ithasreturned branch from 8d16e9d to cee4b1c Compare July 3, 2018 20:38

mirv-sillyfish force-pushed the ithasreturned branch from a76f0cf to 992e838 Compare August 14, 2018 22:35

mirv-sillyfish force-pushed the ithasreturned branch 3 times, most recently from 97fe1be to 02ad46e Compare September 3, 2018 19:10

mirv-sillyfish force-pushed the ithasreturned branch from a51fbd1 to d19d560 Compare September 6, 2018 19:36

mirv-sillyfish added 6 commits September 18, 2018 18:51

AURORA: Shared mesh data for modelnodes.

a25c39e

Addition of shared mesh and increment/decrement changes to track them.

GRAPHICS: Add _shaderRenderable to modelnode

18e4821

A shader renderable is really a description of how to render something, so add support for it to modelnode.

GRAPHICS: Model_NWN loads _mesh

0178633

Load appropriate index and vertex data into _mesh, suitable for modelnode rendering.

GRAPHICS: Model_NWN default shader renderable

ee1cc89

model_nwn now has a defalt shader renderable. It is not not copied when inheriting from a parent node.

SHADER: ShaderRenderable resource tracking fixes

f9aa48b

ShaderRenderable now properly increments and decrements component resource counts as they are added or removed.

mirv-sillyfish added 28 commits September 18, 2018 23:07

GRAPHICS: Render texturefont with colour

b47f4b1

Add colour support when rendering text using texturefont. This is known to work with NWN, but may break other games.

GRAPHICS: Jade Empire abcfont

b6f31d2

Use shaders for Jade Empire abfont text rendering. Portraits should really be made to work again soon.

NWN: Black portrait borders

faa268d

Black borders around portraits supported. Only black. This commit includes rebase fixes for glm transform support.

GRAPHICS: Use radians for animation orientation

b40be12

Use radians when setting a node's orientation, not degrees.

GRAPHICS: ModelNode alpha override

e120586

Allow modelnodes to specificy an alpha value even without a valid _mesh component.

GRAPHICS: Separate rendering pathways for shaders

02c8029

Start to use renderImmediate and queueRender over normal render calls to allow per-game shader based rendering easier.

GRAPHICS: create absolute position on finalize

85b97f6

On call to finalize in Model, make sure createAbsolutePosition is called to ensure transformation matrices are up to date.

GRAPHICS: GL3.2 render path updates

34e08f0

With Mesa supporting GL3.2 compatibility profiles, update code to render properly on the GL3.2 code pathways.

GRAPHICS: Create separate render pathway for shader backend

f7e5a88

To avoid affecting working games, create separate render pathway for the shader work. This can be enabled at engine initialisation.

GRAPHICS: Revert text draw pathways for non-shader rendering

329978d

Use old rendering pathways if shaders are not in use. This is incomplete work.

KOTOR fix a few animation details. Use radians rather than degrees.

97e2064

GRAPHICS: Fix degrees/radians in orientation

9bdecbb

All orientation in degrees, with conversion to radians prior to any call to glm::rotate.

GRAPHICS: Command line option to use OpenGL 3

024a2ec

Use command line option --opengl3=true/false to specify if GL3.2 should be attempted or not.

GRAPHICS: Shader based rotation fix

86630a4

Fix rotation on the shader based rendering path.

GRAPHICS: Dragon Age mesh load fix

08c8763

Only attempt to plug in raw mesh data if the node is of type mesh for Dragon Age. Actually create rawMesh as well.

GRAPHICS: Do not overwrite _projection

3a2d1cf

Sonic uses an orthographical projection, not a 3d perspective projection, so don't assume 3d perspective in renderWorld.

GRAPHICS: Add kotor meshes to MeshMan

15a8e1d

Always add meshes from KotOR to MeshMan, else they are not freed at program exit.

GRAPHICS: Suppress excessive Jade Empire output

812bf92

Suppress excessive development output when loading Jade Empire models.

GRAPHICS: Fix ABCFont memory leak

b50b7cb

Delete ABCFont renderable and material properly.

GRAPHICS: KotOR memory leak fix

96a77e0

Assign name before passing mesh to MeshMan to have MeshMan accept the mesh and later properly delete it.

GRAPHICS: Fix Jade Empire memory leaks

2be72e3

Properly save Jade Empire mesh data to MeshMan, so that it's correctly freed later.

GRAPHICS: Fix The Witcher memory leak

2ddefd2

Probably a good idea to add created meshes to MeshMan in all cases.

GRAPHICS: NWN2 crash and memory leak fix

e3ab2f7

Create rawMesh correctly, and assign data to MeshMan correctly.

GRAPHICS: Remove outdated material building for Jade Empire

fa3bc8c

Remove outdated material build for Jade Empire that relied on the older shader construction routines.

GRAPHICS: Remove deprecated shader construction code

5c6367a

Remove strings and deprecated shader building system.

GRAPHICS: Remove deprecated shader construction from KotOR

2bf0f56

Old shader construction code is deprecated, remove it from KotOR.

GRAPHICS: Remove old shader construction in The Witcher

f225e66

Remove deprecated shader construction code from The Witcher.

GRAPHICS: Remove deprecated shader builder

adeab18

ShaderBuilder is deprecated, and removed.

mirv-sillyfish closed this Feb 5, 2019

mirv-sillyfish deleted the ithasreturned branch February 5, 2019 16:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ithasreturned #123

Ithasreturned #123

mirv-sillyfish commented Jun 28, 2016

DrMcCoy Jun 29, 2016

DrMcCoy commented Jun 29, 2016


		switch (flags) {
		void ShaderBuilder::addVertexShaderString(Common::UString &header, Common::UString &body, uint32 passType, uint32 blendType, bool isGL3) {

Ithasreturned #123

Ithasreturned #123

Conversation

mirv-sillyfish commented Jun 28, 2016

DrMcCoy Jun 29, 2016

Choose a reason for hiding this comment

DrMcCoy commented Jun 29, 2016