Skip to content
Permalink
Browse files

Merge pull request #310 from braunms/mergesphere

SphereRenderer: Renaming and Compatibility
  • Loading branch information...
tobiasrau committed Jul 19, 2019
2 parents 8f29f6d + c7acc77 commit 078f6310d3a5ebed757526e7e6b7aea972fa45de
Showing with 929 additions and 1,322 deletions.
  1. +1 −1 Network.md
  2. +0 −28 core/Shaders/geosphere.btf
  3. +0 −56 core/Shaders/mdao2.btf
  4. +0 −6 core/Shaders/mdao2mipmap.btf
  5. +0 −19 core/Shaders/mdao2volume.btf
  6. +1 −1 core/Shaders/mipdepth4.btf
  7. +0 −28 core/Shaders/ngbufferarray.btf
  8. +0 −30 core/Shaders/ngsphere.btf
  9. +0 −25 core/Shaders/ngsplat.btf
  10. +0 −28 core/Shaders/simplesphere.btf
  11. +1 −1 core/Shaders/{simplesphere → sphere}/geosphere_frag_main.glsl
  12. 0 core/Shaders/{simplesphere → sphere}/geosphere_geo_mainend.glsl
  13. 0 core/Shaders/{simplesphere → sphere}/geosphere_geo_mainstart.glsl
  14. 0 core/Shaders/{simplesphere → sphere}/geosphere_vert_attributes.glsl
  15. 0 core/Shaders/{simplesphere → sphere}/geosphere_vert_defines.glsl
  16. 0 core/Shaders/{simplesphere → sphere}/geosphere_vert_main.glsl
  17. 0 core/Shaders/{simplesphere/mdao2_deferred_frag_ambocc.glsl → sphere/mdao_deferred_frag_ambocc.glsl}
  18. 0 .../{simplesphere/mdao2_deferred_frag_ambocc_stub.glsl → sphere/mdao_deferred_frag_ambocc_stub.glsl}
  19. 0 ...haders/{simplesphere/mdao2_deferred_frag_lighting.glsl → sphere/mdao_deferred_frag_lighting.glsl}
  20. 0 ...mplesphere/mdao2_deferred_frag_lighting_stub.glsl → sphere/mdao_deferred_frag_lighting_stub.glsl}
  21. 0 core/Shaders/{simplesphere/mdao2_deferred_frag_main.glsl → sphere/mdao_deferred_frag_main.glsl}
  22. 0 core/Shaders/{simplesphere/mdao2_deferred_vert_main.glsl → sphere/mdao_deferred_vert_main.glsl}
  23. 0 core/Shaders/{simplesphere/mdao2_frag_main.glsl → sphere/mdao_frag_main.glsl}
  24. 0 core/Shaders/{simplesphere/mdao2_geometry_geo_mainend.glsl → sphere/mdao_geometry_geo_mainend.glsl}
  25. 0 ...haders/{simplesphere/mdao2_geometry_geo_mainstart.glsl → sphere/mdao_geometry_geo_mainstart.glsl}
  26. 0 core/Shaders/{simplesphere/mdao2_geometry_vert_main.glsl → sphere/mdao_geometry_vert_main.glsl}
  27. 0 core/Shaders/{simplesphere/mdao2mipmap_comp_main.glsl → sphere/mdao_mipmap_comp_main.glsl}
  28. 0 core/Shaders/{simplesphere/mdao2_vert_corners.glsl → sphere/mdao_vert_corners.glsl}
  29. 0 core/Shaders/{simplesphere/mdao2_vert_mainend.glsl → sphere/mdao_vert_mainend.glsl}
  30. 0 core/Shaders/{simplesphere/mdao2_vert_mainstart.glsl → sphere/mdao_vert_mainstart.glsl}
  31. 0 core/Shaders/{simplesphere/mdao2volume_frag_main.glsl → sphere/mdao_volume_frag_main.glsl}
  32. 0 core/Shaders/{simplesphere/mdao2volume_geo_main.glsl → sphere/mdao_volume_geo_main.glsl}
  33. 0 core/Shaders/{simplesphere/mdao2volume_vert_main.glsl → sphere/mdao_volume_vert_main.glsl}
  34. 0 core/Shaders/{simplesphere → sphere}/simple_frag_mainend.glsl
  35. +2 −1 core/Shaders/{simplesphere → sphere}/simple_frag_mainstart.glsl
  36. 0 core/Shaders/{simplesphere → sphere}/simple_frag_out-depth.glsl
  37. 0 core/Shaders/{simplesphere → sphere}/simple_frag_out-lighting.glsl
  38. 0 core/Shaders/{simplesphere → sphere}/simple_vert_attributes.glsl
  39. 0 core/Shaders/{simplesphere → sphere}/simple_vert_clipping.glsl
  40. 0 core/Shaders/{simplesphere → sphere}/simple_vert_mainend.glsl
  41. 0 core/Shaders/{simplesphere → sphere}/simple_vert_mainstart.glsl
  42. 0 core/Shaders/{simplesphere → sphere}/simple_vert_posout.glsl
  43. 0 core/Shaders/{simplesphere → sphere}/simple_vert_postrans.glsl
  44. 0 core/Shaders/{simplesphere → sphere}/simple_vert_spheretouchplane.glsl
  45. +1 −1 core/Shaders/{simplesphere/ngsplat_frag_main.glsl → sphere/splat_frag_main.glsl}
  46. 0 core/Shaders/{simplesphere/ngsplat_vert_attributes.glsl → sphere/splat_vert_attributes.glsl}
  47. 0 core/Shaders/{simplesphere/ngsplat_vert_mainend.glsl → sphere/splat_vert_mainend.glsl}
  48. 0 core/Shaders/{simplesphere/ngsphere_vert_attributes.glsl → sphere/ssbosphere_vert_attributes.glsl}
  49. 0 core/Shaders/{simplesphere/ngsphere_vert_mainparams.glsl → sphere/ssbosphere_vert_mainparams.glsl}
  50. 0 core/Shaders/{simplesphere/ngsphere_vert_mainstart.glsl → sphere/ssbosphere_vert_mainstart.glsl}
  51. +28 −0 core/Shaders/sphere_bufferarray.btf
  52. +1 −1 core/Shaders/{simplesphere.double.btf → sphere_double.btf}
  53. +28 −0 core/Shaders/sphere_geo.btf
  54. +56 −0 core/Shaders/sphere_mdao.btf
  55. +6 −0 core/Shaders/sphere_mdao_mipmap.btf
  56. +19 −0 core/Shaders/sphere_mdao_volume.btf
  57. +28 −0 core/Shaders/sphere_simple.btf
  58. +25 −0 core/Shaders/sphere_splat.btf
  59. +30 −0 core/Shaders/sphere_ssbo.btf
  60. +7 −21 core/include/mmcore/moldyn/{AbstractSimpleSphereRenderer.h → AbstractSphereRenderer.h}
  61. +2 −2 core/include/mmcore/moldyn/D3D11SimpleSphereRenderer.h
  62. +105 −63 core/include/mmcore/moldyn/{SimpleSphereRenderer.h → SphereRenderer.h}
  63. +1 −0 core/include/mmcore/utility/{MDAO2ShaderUtilities.h → MDAOShaderUtilities.h}
  64. +4 −3 core/include/mmcore/utility/{MDAO2VolumeGenerator.h → MDAOVolumeGenerator.h}
  65. +1 −1 core/include/mmcore/utility/SSBOBufferArray.h
  66. +1 −1 core/include/mmcore/utility/SSBOStreamer.h
  67. +1 −1 core/src/CoreInstance.cpp
  68. +2 −2 core/src/factories/ModuleClassRegistry.cpp
  69. +0 −409 core/src/moldyn/AbstractSimpleSphereRenderer.cpp
  70. +192 −0 core/src/moldyn/AbstractSphereRenderer.cpp
  71. +2 −2 core/src/moldyn/MipDepthSphereRenderer.cpp
  72. +341 −551 core/src/moldyn/{SimpleSphereRenderer.cpp → SphereRenderer.cpp}
  73. +1 −1 core/src/utility/{MDAO2ShaderUtilities.cpp → MDAOShaderUtilities.cpp}
  74. +17 −17 core/src/utility/{MDAO2VolumeGenerator.cpp → MDAOVolumeGenerator.cpp}
  75. +5 −5 docs/manual.md
  76. +4 −4 plugins/mmstd_moldyn/src/rendering/BrickStatsRenderer.cpp
  77. +3 −3 plugins/protein/src/CartoonTessellationRenderer.cpp
  78. +2 −1 plugins/protein/src/SphereRenderer.h
  79. +4 −2 plugins/protein/src/SphereRendererMouse.h
  80. +4 −4 utils/MMPLD/GenTestFiles.pl
  81. +3 −3 utils/MMPLD/mmpld.mmprj
@@ -31,7 +31,7 @@ if role == "boss" then
else
mmCreateModule("View3D", "::mini-lua::v")
end
mmCreateModule("SimpleSphereRenderer", "::mini-lua::ssr")
mmCreateModule("SphererRenderer", "::mini-lua::ssr")
mmCreateModule("MMPLDDataSource", "::mini-lua::ds")
mmCreateModule("LinearTransferFunction", "::mini-lua::ltf")
mmCreateCall("CallRender3D", "::mini-lua::v::rendering", "::mini-lua::ssr::rendering")

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -62,7 +62,7 @@ void main(void) {
} else {
inPos = vec4(cellPos + (cellPos - gl_Vertex.xyz), gl_Vertex.w);
}
gl_Position = gl_ModelViewProjectionMatrix * inPos;;
gl_Position = gl_ModelViewProjectionMatrix * inPos;
}
]]>
</snippet>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,4 +1,4 @@
#extension GL_ARB_explicit_attrib_location : enable // glsl version 150
#extension GL_ARB_explicit_attrib_location : require // glsl version 130

uniform vec4 viewAttr; // TODO: check fragment position if viewport starts not in (0, 0)

File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,8 @@
#extension GL_ARB_explicit_attrib_location : enable // glsl version 150
#extension GL_ARB_explicit_attrib_location : require // glsl version 130
#extension GL_ARB_conservative_depth : require // glsl version 130
layout (depth_greater) out float gl_FragDepth;


#ifdef BACKSIDE_ENABLED
uniform float hitsideFlag;
#endif // BACKSIDE_ENABLED
File renamed without changes.
@@ -1,4 +1,4 @@
#extension GL_ARB_explicit_attrib_location : enable // glsl version 150
#extension GL_ARB_explicit_attrib_location : require // glsl version 130
#extension GL_ARB_conservative_depth : require // glsl version 130
layout (depth_greater) out float gl_FragDepth;

File renamed without changes.
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<btf type="MegaMolGLSLShader" version="1.0" namespace="sphere_bufferarray">
<include file="common"/>

<shader name="vertex">
<snippet type="version">130</snippet>
<snippet name="CommonDefines" type="file">commondefines.glsl</snippet>
<snippet name="Attributes" type="file">sphere/simple_vert_attributes.glsl</snippet>
<snippet name="MainStart" type="file">sphere/simple_vert_mainstart.glsl</snippet>
<snippet name="PosTrans" type="file">sphere/simple_vert_postrans.glsl</snippet>
<snippet name="ClippingPlane" type="file">sphere/simple_vert_clipping.glsl</snippet>
<snippet name="SphereTouchPlane" type="file">sphere/simple_vert_spheretouchplane.glsl</snippet>
<snippet name="PosOutput" type="file">sphere/simple_vert_posout.glsl</snippet>
<snippet name="MainEnd" type="file">sphere/simple_vert_mainend.glsl</snippet>
</shader>

<shader name="fragment">
<snippet type="version">130</snippet>
<snippet name="CommonDefines" type="file">commondefines.glsl</snippet>
<snippet name="MainStart" type="file">sphere/simple_frag_mainstart.glsl</snippet>
<snippet name="OutLighting" type="file">sphere/simple_frag_out-lighting.glsl</snippet>
<snippet name="OutDepth" type="file">sphere/simple_frag_out-depth.glsl</snippet>
<snippet name="MainEnd" type="file">sphere/simple_frag_mainend.glsl</snippet>

<snippet name="LightDirectional" type="file">lightdirectional.glsl</snippet>
</shader>

</btf>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<btf type="MegaMolGLSLShader" version="1.0" namespace="simplesphere">
<btf type="MegaMolGLSLShader" version="1.0" namespace="sphere_double">
<include file="common"/>

<shader name="vertex">
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<btf type="MegaMolGLSLShader" version="1.0" namespace="sphere_geo">
<include file="common"/>

<shader name="vertex">
<snippet type="version">130</snippet>
<snippet name="CommonDefines" type="file">commondefines.glsl</snippet>
<snippet name="Attributes" type="file">sphere/geosphere_vert_attributes.glsl</snippet>
<snippet name="Main" type="file">sphere/geosphere_vert_main.glsl</snippet>
</shader>

<shader name="geometry">
<snippet type="version">150</snippet>
<snippet name="CommonDefines" type="file">commondefines.glsl</snippet>
<snippet name="MainStart" type="file">sphere/geosphere_geo_mainstart.glsl</snippet>
<snippet name="SphereTouchPlane" type="file">sphere/simple_vert_spheretouchplane.glsl</snippet>
<snippet name="MainEnd" type="file">sphere/geosphere_geo_mainend.glsl</snippet>
</shader>

<shader name="fragment">
<snippet type="version">130</snippet>
<snippet name="CommonDefines" type="file">commondefines.glsl</snippet>
<snippet name="Main" type="file">sphere/geosphere_frag_main.glsl</snippet>

<snippet name="LightDirectional" type="file">lightdirectional.glsl</snippet>
</shader>

</btf>
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<btf type="MegaMolGLSLShader" version="1.0" namespace="sphere_mdao">

<shader name="vertex">
<snippet type="version">150</snippet>
<snippet name="CommonDefines" type="file">commondefines.glsl</snippet>
<snippet name="MainStart" type="file">sphere/mdao_vert_mainstart.glsl</snippet>
<snippet name="Corners" type="file">sphere/mdao_vert_corners.glsl</snippet> <!-- see simple_vert_spheretouchplane.glsl -->
<snippet name="MainEnd" type="file">sphere/mdao_vert_mainend.glsl</snippet>
</shader>

<shader name="fragment">
<snippet type="version">150</snippet>
<snippet name="Main" type="file">sphere/mdao_frag_main.glsl</snippet>
</shader>



<namespace name="geometry">

<shader name="vertex">
<snippet type="version">150</snippet>
<snippet name="Main" type="file">sphere/mdao_geometry_vert_main.glsl</snippet>
</shader>

<shader name="geometry">
<snippet type="version">150</snippet>
<snippet name="CommonDefines" type="file">commondefines.glsl</snippet>
<snippet name="MainStart" type="file">sphere/mdao_geometry_geo_mainstart.glsl</snippet>
<snippet name="Corners" type="file">sphere/mdao_vert_corners.glsl</snippet> <!-- see simple_vert_spheretouchplane.glsl -->
<snippet name="MainEnd" type="file">sphere/mdao_geometry_geo_mainend.glsl</snippet>
</shader>

</namespace>



<namespace name="deferred">

<shader name="vertex">
<snippet type="version">150</snippet>
<snippet name="Main" type="file">sphere/mdao_deferred_vert_main.glsl</snippet>
</shader>

<shader name="fragment"> <!-- Snippets are merged depending on need. -->
<snippet name="Main" type="file">sphere/mdao_deferred_frag_main.glsl</snippet>

<snippet name="Lighting" type="file">sphere/mdao_deferred_frag_lighting.glsl</snippet>
<snippet name="LightingStub" type="file">sphere/mdao_deferred_frag_lighting_stub.glsl</snippet>
<snippet name="AmbientOcclusion" type="file">sphere/mdao_deferred_frag_ambocc.glsl</snippet>
<snippet name="AmbientOcclusionStub" type="file">sphere/mdao_deferred_frag_ambocc_stub.glsl</snippet>
</shader>

</namespace>

</btf>

0 comments on commit 078f631

Please sign in to comment.
You can’t perform that action at this time.