More shader stuff. Updated export templates and README.

Author: ReFreezed

exportTemplates/defaultLuaClipboard.lua

@@ -75,7 +75,11 @@ for _, ps in ipairs(particleSystems) do
 			Text"-- ps:emit(" LuaCsv(ps.emitAtStart) Text")\n"
 		end
 	end
+
 	Text"-- At draw time:\n"
+	if ps.shaderFilename ~= "" then
+		Text"-- love.graphics.setShader(?) -- " Text(ps.shaderPath ~= "" and ps.shaderPath or ps.shaderFilename) Text"\n"
+	end
 	Text"-- love.graphics.setBlendMode(" LuaCsv(ps.blendMode) Text")\n"
 	Text"-- love.graphics.draw(ps)\n"
 end

exportTemplates/defaultLuaModule.lua

@@ -1,8 +1,14 @@
 Text [=[
 --[[
 module = {
-	{ system=particleSystem1, kickStartSteps=steps1, kickStartDt=dt1, emitAtStart=count1, blendMode=blendMode1 },
-	{ system=particleSystem2, kickStartSteps=steps2, kickStartDt=dt2, emitAtStart=count2, blendMode=blendMode2 },
+	{
+		system=particleSystem1,
+		kickStartSteps=steps1, kickStartDt=dt1, emitAtStart=count1,
+		blendMode=blendMode1, shader=shader1,
+		texturePreset=preset1, texturePath=path1,
+		shaderPath=path1, shaderFilename=filename1
+	},
+	{ system=particleSystem2, ... },
 	...
 }
 ]]
@@ -43,6 +49,39 @@ for _, ps in ipairs(particleSystems) do
 	imageIdentBySystem[ps] = imageIdent
 end
 
+-- Define shaders. Some may be shared between multiple particle systems.
+local shaderIdentBySystem   = {}
+local shaderIdentByPath     = {}
+local shaderIdentByFilename = {}
+local shaderN               = 0
+
+for _, ps in ipairs(particleSystems) do
+	if ps.shaderFilename ~= "" then
+		local shaderIdentByKey = ps.shaderPath ~= "" and shaderIdentByPath or shaderIdentByFilename
+		local key              = ps.shaderPath ~= "" and ps.shaderPath     or ps.shaderFilename
+		local shaderIdent      = shaderIdentByKey[key]
+
+		if not shaderIdent then
+			shaderN               = shaderN + 1
+			shaderIdent           = "shader" .. shaderN
+			shaderIdentByKey[key] = shaderIdent
+
+			if shaderN == 1 then  Text"\n"  end
+
+			if ps.shaderPath == "" then
+				Text"local " Text(shaderIdent) Text" = ? -- Filename: " Text(ps.shaderFilename) Text"\n"
+			else
+				Text"local " Text(shaderIdent) Text" = LG.newShader(" LuaCsv(ps.shaderPath) Text")\n"
+			end
+		end
+
+		shaderIdentBySystem[ps] = shaderIdent
+
+	else
+		shaderIdentBySystem[ps] = "nil"
+	end
+end
+
 -- Define particle systems.
 for _, ps in ipairs(particleSystems) do
 	Text"\n"
@@ -83,6 +122,11 @@ for _, ps in ipairs(particleSystems) do
 	Text", kickStartDt="    LuaCsv(ps.kickStartDt)
 	Text", emitAtStart="    LuaCsv(ps.emitAtStart)
 	Text", blendMode="      LuaCsv(ps.blendMode)
+	Text", shader="         Text(shaderIdentBySystem[ps])
+	Text", texturePath="    LuaCsv(ps.texturePath)
+	Text", texturePreset="  LuaCsv(ps.texturePreset)
+	Text", shaderPath="     LuaCsv(ps.shaderPath)
+	Text", shaderFilename=" LuaCsv(ps.shaderFilename)
 	Text"})\n"
 end
 

misc/README.txt

@@ -6,8 +6,9 @@ Developed by Marcus 'ReFreezed' Thunström
 3. Controls
 4. Shortcuts
 5. Parameters
-6. Exporting
-7. Template API
+6. Custom shaders
+7. Exporting
+8. Template API
 
 
 
@@ -106,13 +107,17 @@ Ctrl+Shift+Z    Redo
 Project settings
 ------------------------------------------------------------------------------
 
+Custom data: A custom data string attached to the project that can be used by
+    an export script.
+
 Pixelate:
 - World: Enable pixel art mode. Zoom in on the particles to see the effect.
 - Textures: Enable nearest neighbor filtering on textures. Linear filtering is
     used by default.
 
 Background: Change the background of the particle viewing area.
 - Pattern: Change the opacity of the checker pattern in the background.
+- Size: Change the size of the pattern.
 
 Emitter movement: Automatically move the emitter in a pattern.
 - Scale: Specify how much the emitter should move. Set one axis to 0% to use
@@ -126,6 +131,9 @@ Global scale: Scale time, space and/or size parameters for all particle
 Particle system parameters
 ------------------------------------------------------------------------------
 
+Custom data: A custom data string attached to the particle system that can be
+    used by an export script.
+
 Texture: Choose a built-in texture preset or specify a path to an image file.
 - Offset: Choose where the anchor point of the texture should be for each
     particle. The anchor point is the point the particle rotates around, among
@@ -187,6 +195,8 @@ Color: The color of particles. You can specify up to 8 colors to animate the
     over time on the right hand side.
 - Blend mode: The blend mode for the particle system.
 
+Shader: Path to a shader file to be used when rendering the particles.
+
 
 Animation dialog
 ------------------------------------------------------------------------------
@@ -207,7 +217,26 @@ Sequence: Tool used for quickly generating quads based on a rectangular area
 
 
 
-6. Exporting
+6. Custom shaders
+==============================================================================
+
+You can specify what shaders should be used when rendering particle systems.
+The program exposes some values that can be used in the shaders:
+
+    HOT_PARTICLES
+        This is defined for the preprocessor and can be used with #ifdef or in
+        defined().
+
+    hotParticlesTime
+        Uniform float. Contains the current time.
+
+    hotParticlesEmitterTime
+        Uniform float. Contains the current emitter time (i.e it resets along
+        with the emitter).
+
+
+
+7. Exporting
 ==============================================================================
 
 It's possible to export particle system information and textures (the original
@@ -222,7 +251,7 @@ edit existing scripts or make completely new ones to fit your game (see the
 
 
 
-7. Template API
+8. Template API
 ==============================================================================
 
 Templates are normal Lua scripts in the "exportTemplates" folder. Some of the
@@ -275,6 +304,8 @@ Values:
         radialAcceleration      table    Table with these numeric fields: min, max. Is also an array.
         relativeRotation        boolean  True if relative rotation is enabled, false otherwise
         rotation                table    Table with these numeric fields: min, max. Is also an array.
+        shaderFilename          string   Filename of the shader. Is empty if no shader has been specified. This could be used as a fallback for when shaderPath is empty.
+        shaderPath              string   Path to the shader relative to the specified base folder. Is empty if no shader has been specified or no path is available.
         sizes                   table    Sequence of sizes.
         sizeVariation           number   How varied the sizes are. The value is between 0 and 1.
         speed                   table    Table with these numeric fields: min, max. Is also an array.

src/gui.gloa

@@ -1649,7 +1649,7 @@ local positionAndFit :: (state:State, el:Element, x,y,w,h:int) {
 
 		case InputText:
 			local input = cast(InputText) el
-			if input.field ~= NULL  input.field.setWidth!(w)
+			if input.field ~= NULL  input.field.setWidth!(w - 2*SPACING)
 	}
 }
 
@@ -2976,6 +2976,7 @@ export setFocus :: (state:State, input:InputText) {
 	}
 
 	input.field.setText!(input.value)
+	input.field.setScroll!(0)
 }
 
 export blurFocus :: (state:State, abort=false) {

src/guiSetup.gloa

@@ -30,7 +30,7 @@ export setupGuiFrames :: () {
 			guiState.separator!({ thick=true }),
 
 			guiState.vbox!({ name="projectSettings",
-				guiState.section!({ label="Custom data",
+				guiState.section!({ --[[name="customDataProjectSection",]] label="Custom data",
 					guiState.inputText!({ name="customDataProject" }),
 				}),
 
@@ -91,7 +91,7 @@ export setupGuiFrames :: () {
 				guiState.tabs!({ name="systems", specialLastTab=true }),
 
 				guiState.scrollable!({
-					guiState.section!({ label="Custom data",
+					guiState.section!({ --[[name="customDataSystemSection",]] label="Custom data",
 						guiState.inputText!({ name="customDataSystem" }),
 					}),
 
@@ -2717,7 +2717,7 @@ export setupGuiCallbacks :: () {
 					local ^ok, basePath = resolveBaseOuputPath(project)
 					if ok {
 						local ^ok, texturePathObj = Path.getRelativeTo(texturePath, basePath)
-						if ok  texturePath = texturePathObj.toString!()
+						if ok and texturePathObj.path[1] ~= ".."  texturePath = texturePathObj.toString!()
 					}
 				} else {
 					texturePath = ""
@@ -2726,23 +2726,45 @@ export setupGuiCallbacks :: () {
 				publicParticleSystem.texturePath = texturePath
 			}
 
+			do {
+				local shaderPath     = ""
+				local shaderFilename = ""
+
+				local ^ok, shaderPathFull = getShaderFullPath(project, system)
+				if ok {
+					ok, shaderFilename = Path(system.shaderPath).getFilename!()
+					if not ok  shaderFilename = ""
+
+					shaderPath = shaderFilename
+
+					local ^ok, basePath = resolveBaseOuputPath(project)
+					if ok {
+						local ^ok, shaderPathObj = Path.getRelativeTo(shaderPathFull, basePath)
+						if ok and shaderPathObj.path[1] ~= ".."  shaderPath = shaderPathObj.toString!()
+					}
+				}
+
+				publicParticleSystem.shaderPath     = shaderPath
+				publicParticleSystem.shaderFilename = shaderFilename
+			}
+
 			publicParticleSystem.blendMode        = system.blendMode
 			publicParticleSystem.bufferSize       = getOptimalBufferSize(system)
+			publicParticleSystem.customData       = system.customData
 			publicParticleSystem.direction        = ps.getDirection!()
 			publicParticleSystem.emissionRate     = ps.getEmissionRate!()
 			publicParticleSystem.emitAtStart      = system.kickStartEmit
 			publicParticleSystem.emitterLifetime  = ps.getEmitterLifetime!()
 			publicParticleSystem.insertMode       = ps.getInsertMode!()
-			publicParticleSystem.kickStartSteps   = system.kickStartSteps
 			publicParticleSystem.kickStartDt      = getKickStartDt(system)
+			publicParticleSystem.kickStartSteps   = system.kickStartSteps
 			publicParticleSystem.relativeRotation = ps.hasRelativeRotation!()
 			publicParticleSystem.sizes            = cast([]float) { ps.getSizesAsVararg!() }
 			publicParticleSystem.sizeVariation    = ps.getSizeVariation!()
 			publicParticleSystem.spinVariation    = ps.getSpinVariation!()
 			publicParticleSystem.spread           = ps.getSpread!()
 			publicParticleSystem.texturePreset    = system.textureName
 			publicParticleSystem.title            = system.title
-			publicParticleSystem.customData       = system.customData
 
 			do { local min,max   = ps.getLinearDamping!()          ; publicParticleSystem.linearDamping          = cast(table) {min,max, min=min,max=max} }
 			do { local min,max   = ps.getParticleLifetime!()       ; publicParticleSystem.particleLifetime       = cast(table) {min,max, min=min,max=max} }

src/main.gloa

@@ -131,7 +131,8 @@ local zoomTime = -9999.00
 
 local updateId = 0
 
-local timeForAnimationPreview = 0.00
+local timeForAnimationPreview   = 0.00
+local particleEmitDurationTotal = 0.00
 
 export isMac: bool
 export lctrl: LK.KeyConstant
@@ -652,6 +653,7 @@ export updateParticleShader :: (project:Project, system:System, saveRecent=false
 			versionLine.."\z
 			#define HOT_PARTICLES\n\z
 			uniform float hotParticlesTime;\n\z
+			uniform float hotParticlesEmitterTime;\n\z
 			"..shaderCode
 
 		local shader, err = pcall_newShader(shaderCode)
@@ -1353,6 +1355,7 @@ local onUpdate :: (dt:float) {
 		particleUpdateTime = LT.getTime()-time
 
 		project.particleEmitDuration += dtForParticles
+		particleEmitDurationTotal    += dtForParticles
 
 		for 2, particleUpdateCount {
 			project.particleEmitDuration += dtForParticles
@@ -1567,7 +1570,8 @@ local onDraw :: () {
 			for system: project.systems  if system.visible {
 				local shader = system.currentShader
 				if shader ~= NULL {
-					if shader.hasUniform!"hotParticlesTime"  shader.send!("hotParticlesTime", project.particleEmitDuration)
+					if shader.hasUniform!"hotParticlesTime"         shader.send!("hotParticlesTime",        particleEmitDurationTotal)
+					if shader.hasUniform!"hotParticlesEmitterTime"  shader.send!("hotParticlesEmitterTime", project.particleEmitDuration)
 				}
 				LG.setShader(shader)
 				LG.setBlendMode(system.blendMode)