summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-03-06 17:05:59 (GMT)
committer jacob1 <jfu614@gmail.com>2013-03-06 17:05:59 (GMT)
commit037618e6f8e6a37574f7ef8ffd90e490fb0ea137 (patch)
treed80246d31a26aee7735a566bccc8ce9e8e4e305d /data
parentad951eb9af20cd1a784fab39c41ade1c19dff2ca (diff)
downloadpowder-037618e6f8e6a37574f7ef8ffd90e490fb0ea137.zip
powder-037618e6f8e6a37574f7ef8ffd90e490fb0ea137.tar.gz
remove auto generated comments from all files, fix some missing tabs, remove unused variables from config.h
Diffstat (limited to 'data')
-rw-r--r--data/IntroText.h48
-rw-r--r--data/Shaders.h29
2 files changed, 35 insertions, 42 deletions
diff --git a/data/IntroText.h b/data/IntroText.h
index 3a930a1..e16db49 100644
--- a/data/IntroText.h
+++ b/data/IntroText.h
@@ -1,28 +1,28 @@
static const char *introTextData =
- "\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - http://powdertoy.co.uk, irc.freenode.net #powder\n"
- "\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n"
- "\n"
- "\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
- "\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"
- "\bgPick your material from the menu using mouse left/right buttons.\n"
- "Draw freeform lines by dragging your mouse left/right button across the drawing area.\n"
- "Shift+drag will create straight lines of particles.\n"
- "Ctrl+drag will result in filled rectangles.\n"
- "Ctrl+Shift+click will flood-fill a closed area.\n"
- "Ctrl+Z will act as Undo.\n"
- "Middle click or Alt+Click to \"sample\" the particles.\n"
- "\n\boUse 'Z' for a zoom tool. Click to make the drawable zoom window stay around. Use the wheel to change the zoom strength\n"
- "Use 'S' to save parts of the window as 'stamps'.\n"
- "'L' will load the most recent stamp, 'K' shows a library of stamps you saved.\n"
- "Use the mouse scroll wheel to change the tool size for particles.\n"
- "The spacebar can be used to pause physics.\n"
- "'P' will take a screenshot and save it into the current directory.\n"
- "\n"
- "Contributors: \bgStanislaw K Skowronek (\brhttp://powder.unaligned.org\bg, \bbirc.unaligned.org #wtf\bg),\n"
- "\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n"
+ "\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - http://powdertoy.co.uk, irc.freenode.net #powder\n"
+ "\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n"
+ "\n"
+ "\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
+ "\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"
+ "\bgPick your material from the menu using mouse left/right buttons.\n"
+ "Draw freeform lines by dragging your mouse left/right button across the drawing area.\n"
+ "Shift+drag will create straight lines of particles.\n"
+ "Ctrl+drag will result in filled rectangles.\n"
+ "Ctrl+Shift+click will flood-fill a closed area.\n"
+ "Ctrl+Z will act as Undo.\n"
+ "Middle click or Alt+Click to \"sample\" the particles.\n"
+ "\n\boUse 'Z' for a zoom tool. Click to make the drawable zoom window stay around. Use the wheel to change the zoom strength\n"
+ "Use 'S' to save parts of the window as 'stamps'.\n"
+ "'L' will load the most recent stamp, 'K' shows a library of stamps you saved.\n"
+ "Use the mouse scroll wheel to change the tool size for particles.\n"
+ "The spacebar can be used to pause physics.\n"
+ "'P' will take a screenshot and save it into the current directory.\n"
+ "\n"
+ "Contributors: \bgStanislaw K Skowronek (\brhttp://powder.unaligned.org\bg, \bbirc.unaligned.org #wtf\bg),\n"
+ "\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n"
"\bgLieuwe Mosch, Anthony Boot, Matthew \"me4502\", MaksProg, jacob1\n"
- "\n"
- "\bgTo use online features such as saving, you need to register at: \brhttp://powdertoy.co.uk/Register.html\n"
+ "\n"
+ "\bgTo use online features such as saving, you need to register at: \brhttp://powdertoy.co.uk/Register.html\n"
"\n"
"\bt" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) " " IDENT_PLATFORM " "
#ifdef X86
@@ -49,4 +49,4 @@ static const char *introTextData =
#ifdef REALISTIC
"REALISTIC"
#endif
- ; \ No newline at end of file
+ ; \ No newline at end of file
diff --git a/data/Shaders.h b/data/Shaders.h
index 9eb125b..ec52733 100644
--- a/data/Shaders.h
+++ b/data/Shaders.h
@@ -1,18 +1,11 @@
-/*
- * Shaders.h
- *
- * Created on: Jan 7, 2012
- * Author: Simon
- */
-
#ifndef SHADERS_H_
#define SHADERS_H_
const char * fireFragment = "#version 120\n\
uniform sampler2D fireAlpha;\
void main () {\
- vec4 texColor = texture2D(fireAlpha, gl_PointCoord);\
- gl_FragColor = vec4(gl_Color.rgb, texColor.a*gl_Color.a);\
+ vec4 texColor = texture2D(fireAlpha, gl_PointCoord);\
+ gl_FragColor = vec4(gl_Color.rgb, texColor.a*gl_Color.a);\
}";
const char * fireVertex = "#version 120\n\
void main(void)\
@@ -31,13 +24,13 @@ void main () {\
vec4 transformY = -texture2D(tfY, vec2(gl_TexCoord[0].s, -gl_TexCoord[0].t));\
transformX.r /= xres;\
transformY.g /= yres;\
- vec4 texColor = vec4(\
- texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.75, transformY.g*0.75)).r,\
- texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.875, transformY.g*0.875)).g,\
- texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r, transformY.g)).b,\
- 1.0\
- );\
- gl_FragColor = texColor;\
+ vec4 texColor = vec4(\
+ texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.75, transformY.g*0.75)).r,\
+ texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.875, transformY.g*0.875)).g,\
+ texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r, transformY.g)).b,\
+ 1.0\
+ );\
+ gl_FragColor = texColor;\
}";
const char * lensVertex = "#version 120\n\
void main(void)\
@@ -69,7 +62,7 @@ uniform sampler2D airY;\
uniform sampler2D airP;\
void main () {\
vec4 texP = texture2D(airP, gl_TexCoord[0].st);\
- gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0);\
+ gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0);\
}";
const char * airPVertex = "#version 120\n\
void main(void)\
@@ -86,7 +79,7 @@ void main () {\
vec4 texX = texture2D(airX, gl_TexCoord[0].st);\
vec4 texY = texture2D(airY, gl_TexCoord[0].st);\
vec4 texP = texture2D(airP, gl_TexCoord[0].st);\
- gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0) + vec4(abs(texX.r)/8.0, abs(texX.r)/8.0, abs(texX.r)/8.0, 1.0) + vec4(abs(texY.g)/8.0, abs(texY.g)/8.0, abs(texY.g)/8.0, 1.0);\
+ gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0) + vec4(abs(texX.r)/8.0, abs(texX.r)/8.0, abs(texX.r)/8.0, 1.0) + vec4(abs(texY.g)/8.0, abs(texY.g)/8.0, abs(texY.g)/8.0, 1.0);\
}";
const char * airCVertex = "#version 120\n\
void main(void)\