From c37dc963db767789eb71a47ee2a92a01fe59ee55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Sun, 30 Aug 2015 13:08:16 +0300 Subject: [PATCH] Definitions|Client: Cleanup Removed use of the now-unnecessary "group" keyword. --- .../renderer.pack/lensflares.pack/images.dei | 2 +- .../net.dengine.client.pack/renderer.pack/shaders/debug.dei | 4 ++-- .../renderer.pack/shaders/fx/bloom.dei | 2 +- .../net.dengine.client.pack/renderer.pack/shaders/fx/blur.dei | 4 ++-- .../net.dengine.client.pack/renderer.pack/shaders/fx/post.dei | 4 ++-- .../net.dengine.client.pack/renderer.pack/shaders/model.dei | 2 +- .../net.dengine.client.pack/renderer.pack/shaders/vr.dei | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/images.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/images.dei index 939fcbeb49..d2be2a587d 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/images.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/images.dei @@ -1,6 +1,6 @@ # Lens Flare Images -group fx.lensflares { +fx.lensflares { image burst { path = "graphics/h-burst.png" } image circle { path = "graphics/circle.png" } image exponent { path = "graphics/exponent.png" } diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/debug.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/debug.dei index b171d81b93..29d9f0bb2b 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/debug.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/debug.dei @@ -1,5 +1,5 @@ -group debug { - group textured { +debug { + textured { # Visualize alpha information. shader alpha { vertex = " diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/bloom.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/bloom.dei index 346b32b4d4..cccc72e883 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/bloom.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/bloom.dei @@ -1,6 +1,6 @@ # Bloom is a specialized additive blur that only applies to bright pixels # (given a configurable threshold for brightness). -group fx.bloom { +fx.bloom { common = " uniform highp mat4 uMvpMatrix; uniform highp vec4 uColor; diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/blur.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/blur.dei index 3eebcc7c86..b8c6cedde6 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/blur.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/blur.dei @@ -1,7 +1,7 @@ -group fx { +fx { # Blurring is done in two passes: horizontal and vertical. This is more # efficient than doing the equivalent amount of blurring in a single pass. - group blur { + blur { # Both passes use the same vertex shader. common = " uniform highp mat4 uMvpMatrix; diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/post.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/post.dei index b1d8c756f6..cd3f248b94 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/post.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/fx/post.dei @@ -1,7 +1,7 @@ -group fx { +fx { # Post-processing shaders need to have uFadeInOut (0..1) for # fading the effect in/out. - group post { + post { shader monochrome { vertex = " uniform highp mat4 uMvpMatrix; diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/model.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/model.dei index afec7ba2f2..fdc44c6dca 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/model.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/model.dei @@ -1,4 +1,4 @@ -group model { +model { # Shader for skeletal animation and generic per-pixel lighting: # diffuse color, normal map, emission map, specular intensity. shader skeletal.normal_specular_emission { diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/vr.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/vr.dei index 29786630d9..ad10d4a96e 100644 --- a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/vr.dei +++ b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/vr.dei @@ -1,5 +1,5 @@ -group vr { - group oculusrift { +vr { + oculusrift { shader barrel { vertex = " #version 120