From 3b9cf4cd35eed981c2269276330d8e238a11baa7 Mon Sep 17 00:00:00 2001 From: "sha..rd" Date: Mon, 11 Apr 2011 19:11:02 +0000 Subject: [PATCH] * Updated Particle.j3md so it works on pre GLSL 1.2 graphics cards git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7229 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../Common/MatDefs/Misc/Particle.frag | 4 ---- .../Common/MatDefs/Misc/Particle.j3md | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/engine/src/core-data/Common/MatDefs/Misc/Particle.frag b/engine/src/core-data/Common/MatDefs/Misc/Particle.frag index 3c378e6e6..08cd2a3bf 100644 --- a/engine/src/core-data/Common/MatDefs/Misc/Particle.frag +++ b/engine/src/core-data/Common/MatDefs/Misc/Particle.frag @@ -1,7 +1,3 @@ -// TODO: Fix this so normal particles don't need it. -// Only needed for certain GPUs. -//#version 120 - #ifdef USE_TEXTURE uniform sampler2D m_Texture; varying vec4 texCoord; diff --git a/engine/src/core-data/Common/MatDefs/Misc/Particle.j3md b/engine/src/core-data/Common/MatDefs/Misc/Particle.j3md index 25283b27d..c33d91d4f 100644 --- a/engine/src/core-data/Common/MatDefs/Misc/Particle.j3md +++ b/engine/src/core-data/Common/MatDefs/Misc/Particle.j3md @@ -36,6 +36,28 @@ MaterialDef Point Sprite { } } + Technique { + + VertexShader GLSL100 : Common/MatDefs/Misc/Particle.vert + FragmentShader GLSL100 : Common/MatDefs/Misc/Particle.frag + + WorldParameters { + WorldViewProjectionMatrix + WorldViewMatrix + WorldMatrix + CameraPosition + } + + RenderState { + Blend AlphaAdditive + DepthWrite Off + } + + Defines { + USE_TEXTURE : Texture + } + } + Technique FixedFunc { RenderState { Blend AlphaAdditive