diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 12:52:26 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 12:52:26 (GMT) |
| commit | 1c7b9d9949f4aca2ceba44b9d41420ad34c69f94 (patch) | |
| tree | f917e85e29ac8c95b4ed894ea4b8b764e2290c47 /build | |
| parent | 014c1fbad669b0cf1abd881e696f0c7e432b3707 (diff) | |
| download | powder-1c7b9d9949f4aca2ceba44b9d41420ad34c69f94.zip powder-1c7b9d9949f4aca2ceba44b9d41420ad34c69f94.tar.gz | |
Pass particle pointer to graphics update function instead of index. Make PIPE use subcall to get graphics info. Cache for particle graphics properties. Stickman PSPEC_STICKMAN added and implemented
Diffstat (limited to 'build')
| -rw-r--r-- | build/test.frag | 5 | ||||
| -rw-r--r-- | build/test.lua | 18 | ||||
| -rw-r--r-- | build/test.vert | 5 |
3 files changed, 0 insertions, 28 deletions
diff --git a/build/test.frag b/build/test.frag deleted file mode 100644 index 0b7a0a8..0000000 --- a/build/test.frag +++ /dev/null @@ -1,5 +0,0 @@ -uniform sampler2D fireAlpha; -void main () { - vec4 texColor = texture2D(fireAlpha, gl_PointCoord); - gl_FragColor = vec4(gl_Color.rgb, texColor.a*gl_Color.a); -} diff --git a/build/test.lua b/build/test.lua deleted file mode 100644 index a41bdd7..0000000 --- a/build/test.lua +++ /dev/null @@ -1,18 +0,0 @@ -tpt.register_step("do_step") -numberthing = 0 -increment = 2 -function do_step() - numberthing = numberthing + increment; - if numberthing >= 400 then - increment = -2 - elseif numberthing < 4 then - increment = 2 - end - tpt.drawtext(numberthing, 50, "Oh my god, this is amazing", 255, 255, 255, 255) - tpt.drawtext(mousex, mousey, "Oh my god, this is amazing", 255, 255, 255, 255) - tpt.reset_velocity(10, 10, 20, 20) - tpt.reset_gravity_field(10, 10, 20, 20) - tpt.set_pressure(10, 10, 20, 20) - tpt.set_gravity(75, 45, 1, 1, 8) - return false -end diff --git a/build/test.vert b/build/test.vert deleted file mode 100644 index 83fc56f..0000000 --- a/build/test.vert +++ /dev/null @@ -1,5 +0,0 @@ -void main(void) -{ - gl_Position = ftransform();; - gl_FrontColor = gl_Color; -} |
