Skip to content

Commit 2bf7b2f

Browse files
revmischarevmischa
committed
setting up presets/shaders/config/fonts for osx package install
1 parent 355d0d9 commit 2bf7b2f

File tree

7 files changed

+373
-19
lines changed

7 files changed

+373
-19
lines changed

‎src/libprojectM/PresetLoader.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class PresetLoader {
3434

3535
~PresetLoader();
3636

37-
/// Load a preset by specifying it's unique identifier given when the preset url
37+
/// Load a preset by specifying its unique identifier given when the preset url
3838
/// was added to this loader
3939
std::auto_ptr<Preset> loadPreset(unsigned int index) const;
4040
std::auto_ptr<Preset> loadPreset ( const std::string & url ) const;

‎src/projectM-iTunes/config.inp‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# config.inp
2+
# Configuration File for projectM
3+
4+
Texture Size = 2048 # Size of internal rendering texture
5+
Mesh X = 4 # Width of PerPixel Equation mesh
6+
Mesh Y = 3 # Height of PerPixel Equation mesh
7+
FPS = 60 # Frames Per Second
8+
Fullscreen = false
9+
Window Width = 512 # startup window width
10+
Window Height = 512 # startup window height
11+
12+
Smooth Transition Duration = 5 # in seconds
13+
Preset Duration = 30 # in seconds
14+
Easter Egg Parameter = 1
15+
16+
Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent
17+
Aspect Correction = true # Custom Shape Aspect Correction
18+
19+
Preset Path = /usr/local/share/projectM/presets # preset location
20+
Title Font = /usr/local/share/projectM/fonts/Vera.ttf
21+
Menu Font = /usr/local/share/projectM/fonts/VeraMono.ttf

‎src/projectM-iTunes/iProjectM.xcodeproj/project.pbxproj‎

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
C3FAE5A117B88C4B00F4B110 /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3FAE5A017B88C4B00F4B110 /* libMilkdropPresetFactory.a */; };
1919
C3FAE5A317B88C5000F4B110 /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3FAE5A217B88C5000F4B110 /* libNativePresetFactory.a */; };
2020
C3FAE5AA17B898C200F4B110 /* iProjectM-pkg.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3FAE5A717B898B000F4B110 /* iProjectM-pkg.plist */; };
21+
C3FAF97417B89F1C00F4B110 /* presets in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3FAF96717B89C7C00F4B110 /* presets */; };
22+
C3FAF97717B89F7400F4B110 /* shaders in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3FAF97617B89F7200F4B110 /* shaders */; };
23+
C3FAF97817B89F7B00F4B110 /* config.inp in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3FAF97517B89F7200F4B110 /* config.inp */; };
24+
C3FAF97B17B8A45200F4B110 /* fonts in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3FAF97917B8A43B00F4B110 /* fonts */; };
2125
/* End PBXBuildFile section */
2226

2327
/* Begin PBXCopyFilesBuildPhase section */
@@ -31,6 +35,19 @@
3135
);
3236
runOnlyForDeploymentPostprocessing = 0;
3337
};
38+
C3FAF97317B89F1700F4B110 /* CopyFiles */ = {
39+
isa = PBXCopyFilesBuildPhase;
40+
buildActionMask = 2147483647;
41+
dstPath = share;
42+
dstSubfolderSpec = 16;
43+
files = (
44+
C3FAF97417B89F1C00F4B110 /* presets in CopyFiles */,
45+
C3FAF97717B89F7400F4B110 /* shaders in CopyFiles */,
46+
C3FAF97B17B8A45200F4B110 /* fonts in CopyFiles */,
47+
C3FAF97817B89F7B00F4B110 /* config.inp in CopyFiles */,
48+
);
49+
runOnlyForDeploymentPostprocessing = 0;
50+
};
3451
/* End PBXCopyFilesBuildPhase section */
3552

3653
/* Begin PBXFileReference section */
@@ -54,6 +71,15 @@
5471
C3FAE5A017B88C4B00F4B110 /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/libMilkdropPresetFactory.a; sourceTree = "<group>"; };
5572
C3FAE5A217B88C5000F4B110 /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/libNativePresetFactory.a; sourceTree = "<group>"; };
5673
C3FAE5A717B898B000F4B110 /* iProjectM-pkg.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iProjectM-pkg.plist"; sourceTree = SOURCE_ROOT; };
74+
C3FAF96717B89C7C00F4B110 /* presets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets; path = ../../presets; sourceTree = "<group>"; };
75+
C3FAF96817B89C7C00F4B110 /* presets_milkdrop */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets_milkdrop; path = ../../presets_milkdrop; sourceTree = "<group>"; };
76+
C3FAF96917B89C7C00F4B110 /* presets_milkdrop_104 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets_milkdrop_104; path = ../../presets_milkdrop_104; sourceTree = "<group>"; };
77+
C3FAF96A17B89C7C00F4B110 /* presets_milkdrop_200 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets_milkdrop_200; path = ../../presets_milkdrop_200; sourceTree = "<group>"; };
78+
C3FAF96B17B89C7C00F4B110 /* presets_projectM */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets_projectM; path = ../../presets_projectM; sourceTree = "<group>"; };
79+
C3FAF96C17B89C7C00F4B110 /* presets_yin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets_yin; path = ../../presets_yin; sourceTree = "<group>"; };
80+
C3FAF97517B89F7200F4B110 /* config.inp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = config.inp; sourceTree = "<group>"; };
81+
C3FAF97617B89F7200F4B110 /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; path = shaders; sourceTree = "<group>"; };
82+
C3FAF97917B8A43B00F4B110 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../../fonts; sourceTree = "<group>"; };
5783
/* End PBXFileReference section */
5884

5985
/* Begin PBXFrameworksBuildPhase section */
@@ -76,6 +102,7 @@
76102
C3F9D7A617B82CC3009E58CB = {
77103
isa = PBXGroup;
78104
children = (
105+
C3FAF97A17B8A44100F4B110 /* share */,
79106
C3FAE5A417B88C5B00F4B110 /* libprojectM */,
80107
C3FAE59917B88B9000F4B110 /* iProjectM */,
81108
C3FAE59017B87D8700F4B110 /* getConfigFilename.cpp */,
@@ -148,6 +175,30 @@
148175
name = libprojectM;
149176
sourceTree = "<group>";
150177
};
178+
C3FAE5AC17B89C3100F4B110 /* presets */ = {
179+
isa = PBXGroup;
180+
children = (
181+
C3FAF96717B89C7C00F4B110 /* presets */,
182+
C3FAF96817B89C7C00F4B110 /* presets_milkdrop */,
183+
C3FAF96917B89C7C00F4B110 /* presets_milkdrop_104 */,
184+
C3FAF96A17B89C7C00F4B110 /* presets_milkdrop_200 */,
185+
C3FAF96B17B89C7C00F4B110 /* presets_projectM */,
186+
C3FAF96C17B89C7C00F4B110 /* presets_yin */,
187+
);
188+
name = presets;
189+
sourceTree = "<group>";
190+
};
191+
C3FAF97A17B8A44100F4B110 /* share */ = {
192+
isa = PBXGroup;
193+
children = (
194+
C3FAF97917B8A43B00F4B110 /* fonts */,
195+
C3FAF97517B89F7200F4B110 /* config.inp */,
196+
C3FAF97617B89F7200F4B110 /* shaders */,
197+
C3FAE5AC17B89C3100F4B110 /* presets */,
198+
);
199+
name = share;
200+
sourceTree = "<group>";
201+
};
151202
/* End PBXGroup section */
152203

153204
/* Begin PBXNativeTarget section */
@@ -157,9 +208,9 @@
157208
buildPhases = (
158209
C3F9D7AB17B82CC3009E58CB /* Sources */,
159210
C3F9D7AC17B82CC3009E58CB /* Frameworks */,
160-
C3F9D7AD17B82CC3009E58CB /* Resources */,
161211
C3FAE5A917B898BB00F4B110 /* CopyFiles */,
162-
C3FAE5AB17B898F800F4B110 /* ShellScript */,
212+
C3FAF97317B89F1700F4B110 /* CopyFiles */,
213+
C3FAE5AB17B898F800F4B110 /* Generate Installer Package */,
163214
);
164215
buildRules = (
165216
);
@@ -196,29 +247,20 @@
196247
};
197248
/* End PBXProject section */
198249

199-
/* Begin PBXResourcesBuildPhase section */
200-
C3F9D7AD17B82CC3009E58CB /* Resources */ = {
201-
isa = PBXResourcesBuildPhase;
202-
buildActionMask = 2147483647;
203-
files = (
204-
);
205-
runOnlyForDeploymentPostprocessing = 0;
206-
};
207-
/* End PBXResourcesBuildPhase section */
208-
209250
/* Begin PBXShellScriptBuildPhase section */
210-
C3FAE5AB17B898F800F4B110 /* ShellScript */ = {
251+
C3FAE5AB17B898F800F4B110 /* Generate Installer Package */ = {
211252
isa = PBXShellScriptBuildPhase;
212253
buildActionMask = 2147483647;
213254
files = (
214255
);
215256
inputPaths = (
216257
);
258+
name = "Generate Installer Package";
217259
outputPaths = (
218260
);
219261
runOnlyForDeploymentPostprocessing = 0;
220262
shellPath = /bin/bash;
221-
shellScript = "pkgbuild --component-plist $SRCROOT/iProjectM-pkg.plist --root $DSTROOT $SRCROOT/iProjectM.pkg\n";
263+
shellScript = "mkdir -p $DSTROOT/usr/local/share/projectM\ncp -r $CONFIGURATION_BUILD_DIR/share/* $DSTROOT/usr/local/share/projectM\npkgbuild --component-plist $SRCROOT/iProjectM-pkg.plist --root $DSTROOT $SRCROOT/iProjectM.pkg\n";
222264
};
223265
/* End PBXShellScriptBuildPhase section */
224266

‎src/projectM-iTunes/iprojectM.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct VisualPluginData;
9494
#endif
9595

9696
#define kInfoTimeOutInSeconds 10 // draw info/artwork for N seconds when it changes or playback starts
97-
#define kPlayingPulseRateInHz 30 // when iTunes is playing, draw N times a second
97+
#define kPlayingPulseRateInHz 60 // when iTunes is playing, draw N times a second
9898
#define kStoppedPulseRateInHz 5 // when iTunes is not playing, draw N times a second
9999

100100
struct VisualPluginData

‎src/projectM-iTunes/iprojectM.mm‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@
88

99
// projectM
1010
void initProjectM( VisualPluginData * visualPluginData ) {
11-
std::string config_filename = getConfigFilename();
12-
projectM *pm = new projectM(config_filename);
11+
// std::string config_filename = getConfigFilename();
12+
projectM *pm = new projectM("/usr/local/share/projectM/config.inp");
1313

1414
visualPluginData->pm = pm;
15+
16+
// start off with a random preset
17+
unsigned int playlistSize = pm->getPlaylistSize();
18+
unsigned int index = rand() % playlistSize;
19+
pm->selectPreset(index, false);
1520
}
1621

17-
1822
//-------------------------------------------------------------------------------------------------
1923
// ProcessRenderData
2024
//-------------------------------------------------------------------------------------------------

‎src/projectM-iTunes/shaders/blur.cg‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
struct outtype {float4 color : COLOR;};
2+
3+
uniform float4 srctexsize;
4+
5+
outtype blur1(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0)
6+
{
7+
float2 uv2 = uv.xy + srctexsize.zw*float2(1,1);
8+
9+
float d=.00175;
10+
11+
float3 val = tex2D(sampler_blur, float2(uv.x-d, uv.y)).xyz;
12+
val += tex2D(sampler_blur, float2(uv.x+d, uv.y)).xyz;
13+
val += tex2D(sampler_blur, float2(uv.x, uv.y + d)).xyz;
14+
val += tex2D(sampler_blur, float2(uv.x, uv.y - d)).xyz;
15+
16+
float3 val2 = tex2D(sampler_blur, float2(uv.x-d, uv.y -d)).xyz;
17+
val += tex2D(sampler_blur, float2(uv.x-d, uv.y +d)).xyz;
18+
val += tex2D(sampler_blur, float2(uv.x+d, uv.y + d)).xyz;
19+
val += tex2D(sampler_blur, float2(uv.x +d, uv.y - d)).xyz;
20+
21+
outtype OUT;
22+
val *= 0.65;
23+
val2 *= 0.35;
24+
25+
OUT.color.xyz = val* 0.25 + val2 * 0.25;
26+
OUT.color.w = 1;
27+
return OUT;
28+
}
29+
30+
outtype blur2(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0)
31+
{
32+
float2 uv2 = uv.xy + srctexsize.zw*float2(1,0);
33+
34+
float d = srctexsize.z;
35+
d=.0015;
36+
37+
float3 val = tex2D(sampler_blur, float2(uv.x-d, uv.y)).xyz;
38+
val += tex2D(sampler_blur, float2(uv.x+d, uv.y)).xyz;
39+
val += tex2D(sampler_blur, float2(uv.x, uv.y + d)).xyz;
40+
val += tex2D(sampler_blur, float2(uv.x, uv.y - d)).xyz;
41+
42+
val *= 0.25;
43+
44+
float t = min( min(uv.x, uv.y), 1-max(uv.x,uv.y) );
45+
t = sqrt(t);
46+
47+
float minimum = 0.5;
48+
float variance = 0.5;
49+
float size = 50;
50+
51+
t = minimum + variance*saturate(t*size);
52+
t = 1;
53+
val.xyz *= t;
54+
55+
outtype OUT;
56+
OUT.color.xyz = val;
57+
OUT.color.w = 1;
58+
return OUT;
59+
}
60+
61+
outtype blurHoriz(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0)
62+
{
63+
64+
// LONG HORIZ. PASS 1:
65+
const float w[8] = { 4.0, 3.8, 3.5, 2.9, 1.9, 1.2, 0.7, 0.3 };
66+
const float w1 = w[0] + w[1];
67+
const float w2 = w[2] + w[3];
68+
const float w3 = w[4] + w[5];
69+
const float w4 = w[6] + w[7];
70+
const float d1 = 0 + 2*w[1]/w1;
71+
const float d2 = 2 + 2*w[3]/w2;
72+
const float d3 = 4 + 2*w[5]/w3;
73+
const float d4 = 6 + 2*w[7]/w4;
74+
const float w_div = 0.5/(w1+w2+w3+w4);
75+
76+
float fscale = 1;
77+
float fbias = 0;
78+
79+
80+
// note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels.
81+
//float2 uv2 = uv.xy;// + srctexsize.zw*float2(0.5,0.5);
82+
float2 uv2 = uv.xy + srctexsize.zw*float2(1,1); // + moves blur UP, LEFT by 1-pixel increments
83+
84+
float3 blur =
85+
( tex2D( sampler_blur, uv2 + float2( d1*srctexsize.z,0) ).xyz
86+
+ tex2D( sampler_blur, uv2 + float2(-d1*srctexsize.z,0) ).xyz)*w1 +
87+
( tex2D( sampler_blur, uv2 + float2( d2*srctexsize.z,0) ).xyz
88+
+ tex2D( sampler_blur, uv2 + float2(-d2*srctexsize.z,0) ).xyz)*w2 +
89+
( tex2D( sampler_blur, uv2 + float2( d3*srctexsize.z,0) ).xyz
90+
+ tex2D( sampler_blur, uv2 + float2(-d3*srctexsize.z,0) ).xyz)*w3 +
91+
( tex2D( sampler_blur, uv2 + float2( d4*srctexsize.z,0) ).xyz
92+
+ tex2D( sampler_blur, uv2 + float2(-d4*srctexsize.z,0) ).xyz)*w4
93+
;
94+
blur.xyz *= w_div;
95+
96+
blur.xyz = blur.xyz*fscale + fbias;
97+
98+
outtype OUT;
99+
OUT.color.xyz = blur;
100+
OUT.color.w = 1;
101+
102+
return OUT;
103+
}
104+
105+
outtype blurVert(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0)
106+
{
107+
//SHORT VERTICAL PASS 2:
108+
109+
110+
const float w[8] = { 4.0, 3.8, 3.5, 2.9, 1.9, 1.2, 0.7, 0.3 };
111+
112+
const float w1 = w[0]+w[1] + w[2]+w[3];
113+
const float w2 = w[4]+w[5] + w[6]+w[7];
114+
const float d1 = 0 + 2*((w[2]+w[3])/w1);
115+
const float d2 = 2 + 2*((w[6]+w[7])/w2);
116+
const float w_div = 1.0/((w1+w2)*2);
117+
118+
119+
120+
// note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels.
121+
//float2 uv2 = uv.xy;// + srctexsize.zw*float2(-0.5,-0.5);
122+
float2 uv2 = uv.xy + srctexsize.zw*float2(1,0); // + moves blur UP, LEFT by TWO-pixel increments! (since texture is 1/2 the size of blur1_ps)
123+
124+
float3 blur =
125+
( tex2D( sampler_blur, uv2 + float2(0, d1*srctexsize.w) ).xyz
126+
+ tex2D( sampler_blur, uv2 + float2(0,-d1*srctexsize.w) ).xyz)*w1 +
127+
( tex2D( sampler_blur, uv2 + float2(0, d2*srctexsize.w) ).xyz
128+
+ tex2D( sampler_blur, uv2 + float2(0,-d2*srctexsize.w) ).xyz)*w2
129+
;
130+
blur.xyz *= w_div;
131+
132+
// tone it down at the edges: (only happens on 1st X pass!)
133+
float t = min( min(uv.x, uv.y), 1-max(uv.x,uv.y) );
134+
135+
float minimum = 0.5;
136+
float variance = 0.5;
137+
float size = 50;
138+
139+
140+
blur.xyz *= t;
141+
142+
t = sqrt(t);
143+
t = minimum + variance*saturate(t*size);
144+
t=1;
145+
blur.xyz *= t;
146+
147+
outtype OUT;
148+
OUT.color.xyz = blur;
149+
OUT.color.w = 1;
150+
return OUT;
151+
}

0 commit comments

Comments
 (0)