Merge lp:~smspillaz/compiz/compiz.animationsplus-returns-v3 into lp:compiz/0.9.13
- compiz.animationsplus-returns-v3
- Merge into 0.9.13
Proposed by
Sam Spilsbury
Status: | Superseded |
---|---|
Proposed branch: | lp:~smspillaz/compiz/compiz.animationsplus-returns-v3 |
Merge into: | lp:compiz/0.9.13 |
Prerequisite: | lp:~smspillaz/compiz/compiz.simple-animations-returns-v2 |
Diff against target: |
1374 lines (+1254/-9) 16 files modified
debian/compiz-dev.install (+1/-0) debian/compiz-plugins.install (+2/-0) debian/compiz-plugins.install.armel (+2/-0) debian/compiz-plugins.install.armhf (+2/-0) plugins/animationjc/CMakeLists.txt (+1/-4) plugins/animationplus/CMakeLists.txt (+4/-0) plugins/animationplus/VERSION (+1/-0) plugins/animationplus/animationplus.xml.in (+185/-0) plugins/animationplus/src/animation_tex.h (+222/-0) plugins/animationplus/src/animationplus.cpp (+158/-0) plugins/animationplus/src/blinds.cpp (+70/-0) plugins/animationplus/src/bonanza.cpp (+241/-0) plugins/animationplus/src/helix.cpp (+93/-0) plugins/animationplus/src/private.h (+196/-0) plugins/animationplus/src/shatter.cpp (+75/-0) plugins/simple-animations/CMakeLists.txt (+1/-5) |
To merge this branch: | bzr merge lp:~smspillaz/compiz/compiz.animationsplus-returns-v3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Needs Fixing | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+300101@code.launchpad.net |
This proposal supersedes a proposal from 2016-07-09.
This proposal has been superseded by a proposal from 2016-07-25.
Commit message
Re-add the animationsplus plugn
Description of the change
Re-add the animationsplus plugin
(Thanks to MC Return for preserving the code)
To post a comment you must log in.
- 4075. By Sam Spilsbury <email address hidden>
-
debian/
compiz- plugins. install: Fix typo in animationplus - 4076. By Sam Spilsbury <email address hidden>
-
Merge lp:~smspillaz/compiz/compiz.simple-animations-returns-v3
- 4077. By Sam Spilsbury <email address hidden>
-
animationplus: No need for libGLU
- 4078. By Sam Spilsbury <email address hidden>
-
animationplus: Remove libGLU include
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/compiz-dev.install' | |||
2 | --- debian/compiz-dev.install 2016-06-28 14:57:19 +0000 | |||
3 | +++ debian/compiz-dev.install 2016-07-25 17:11:00 +0000 | |||
4 | @@ -2,6 +2,7 @@ | |||
5 | 2 | debian/tmp/usr/lib/*/libcompiz_core.so | 2 | debian/tmp/usr/lib/*/libcompiz_core.so |
6 | 3 | debian/tmp/usr/lib/*/pkgconfig/compiz-animation.pc | 3 | debian/tmp/usr/lib/*/pkgconfig/compiz-animation.pc |
7 | 4 | debian/tmp/usr/lib/*/pkgconfig/compiz-animationaddon.pc | 4 | debian/tmp/usr/lib/*/pkgconfig/compiz-animationaddon.pc |
8 | 5 | debian/tmp/usr/lib/*/pkgconfig/compiz-animationjc.pc | ||
9 | 5 | debian/tmp/usr/lib/*/pkgconfig/compiz-compiztoolbox.pc | 6 | debian/tmp/usr/lib/*/pkgconfig/compiz-compiztoolbox.pc |
10 | 6 | debian/tmp/usr/lib/*/pkgconfig/compiz-composite.pc | 7 | debian/tmp/usr/lib/*/pkgconfig/compiz-composite.pc |
11 | 7 | debian/tmp/usr/lib/*/pkgconfig/compiz-cube.pc | 8 | debian/tmp/usr/lib/*/pkgconfig/compiz-cube.pc |
12 | 8 | 9 | ||
13 | === modified file 'debian/compiz-plugins.install' | |||
14 | --- debian/compiz-plugins.install 2016-07-25 17:10:49 +0000 | |||
15 | +++ debian/compiz-plugins.install 2016-07-25 17:11:00 +0000 | |||
16 | @@ -6,6 +6,8 @@ | |||
17 | 6 | usr/share/compiz/*animationaddon.* | 6 | usr/share/compiz/*animationaddon.* |
18 | 7 | usr/lib/*/compiz/*animationjc.* | 7 | usr/lib/*/compiz/*animationjc.* |
19 | 8 | usr/share/compiz/*animationjc.* | 8 | usr/share/compiz/*animationjc.* |
20 | 9 | usr/lib/*/compiz/*animationplus.* | ||
21 | 10 | usr/share/compiz/*animationplus.* | ||
22 | 9 | usr/lib/*/compiz/*animationsim.* | 11 | usr/lib/*/compiz/*animationsim.* |
23 | 10 | usr/share/compiz/*animationsim.* | 12 | usr/share/compiz/*animationsim.* |
24 | 11 | usr/lib/*/compiz/*bench.* | 13 | usr/lib/*/compiz/*bench.* |
25 | 12 | 14 | ||
26 | === modified file 'debian/compiz-plugins.install.armel' | |||
27 | --- debian/compiz-plugins.install.armel 2016-07-25 17:10:49 +0000 | |||
28 | +++ debian/compiz-plugins.install.armel 2016-07-25 17:11:00 +0000 | |||
29 | @@ -6,6 +6,8 @@ | |||
30 | 6 | usr/share/compiz/*animationaddon.* | 6 | usr/share/compiz/*animationaddon.* |
31 | 7 | usr/lib/*/compiz/*animationjc.* | 7 | usr/lib/*/compiz/*animationjc.* |
32 | 8 | usr/share/compiz/*animationjc.* | 8 | usr/share/compiz/*animationjc.* |
33 | 9 | usr/lib/*/compiz/*animationplus.* | ||
34 | 10 | usr/share/compiz/*animationplus.* | ||
35 | 9 | usr/lib/*/compiz/*animationsim.* | 11 | usr/lib/*/compiz/*animationsim.* |
36 | 10 | usr/share/compiz/*animationsim.* | 12 | usr/share/compiz/*animationsim.* |
37 | 11 | usr/lib/*/compiz/*clone.* | 13 | usr/lib/*/compiz/*clone.* |
38 | 12 | 14 | ||
39 | === modified file 'debian/compiz-plugins.install.armhf' | |||
40 | --- debian/compiz-plugins.install.armhf 2016-07-25 17:10:49 +0000 | |||
41 | +++ debian/compiz-plugins.install.armhf 2016-07-25 17:11:00 +0000 | |||
42 | @@ -6,6 +6,8 @@ | |||
43 | 6 | usr/share/compiz/*animationaddon.* | 6 | usr/share/compiz/*animationaddon.* |
44 | 7 | usr/lib/*/compiz/*animationjc.* | 7 | usr/lib/*/compiz/*animationjc.* |
45 | 8 | usr/share/compiz/*animationjc.* | 8 | usr/share/compiz/*animationjc.* |
46 | 9 | usr/lib/*/compiz/*animationplus.* | ||
47 | 10 | usr/share/compiz/*animationplus.* | ||
48 | 9 | usr/lib/*/compiz/*animationsim.* | 11 | usr/lib/*/compiz/*animationsim.* |
49 | 10 | usr/share/compiz/*animationsim.* | 12 | usr/share/compiz/*animationsim.* |
50 | 11 | usr/lib/*/compiz/*clone.* | 13 | usr/lib/*/compiz/*clone.* |
51 | 12 | 14 | ||
52 | === modified file 'plugins/animationjc/CMakeLists.txt' | |||
53 | --- plugins/animationjc/CMakeLists.txt 2016-07-25 17:10:49 +0000 | |||
54 | +++ plugins/animationjc/CMakeLists.txt 2016-07-25 17:11:00 +0000 | |||
55 | @@ -1,7 +1,4 @@ | |||
56 | 1 | find_package (Compiz REQUIRED) | 1 | find_package (Compiz REQUIRED) |
57 | 2 | include (CompizPlugin) | 2 | include (CompizPlugin) |
58 | 3 | include (FindOpenGL) | ||
59 | 4 | 3 | ||
63 | 5 | if (OPENGL_GLU_FOUND) | 4 | compiz_plugin (animationjc PLUGINDEPS composite opengl animation) |
61 | 6 | compiz_plugin (animationjc PLUGINDEPS composite opengl animation LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR}) | ||
62 | 7 | endif (OPENGL_GLU_FOUND) | ||
64 | 8 | 5 | ||
65 | === added directory 'plugins/animationplus' | |||
66 | === added file 'plugins/animationplus/CMakeLists.txt' | |||
67 | --- plugins/animationplus/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
68 | +++ plugins/animationplus/CMakeLists.txt 2016-07-25 17:11:00 +0000 | |||
69 | @@ -0,0 +1,4 @@ | |||
70 | 1 | find_package (Compiz REQUIRED) | ||
71 | 2 | include (CompizPlugin) | ||
72 | 3 | |||
73 | 4 | compiz_plugin (animationplus PLUGINDEPS animation animationaddon composite opengl) | ||
74 | 0 | 5 | ||
75 | === added file 'plugins/animationplus/VERSION' | |||
76 | --- plugins/animationplus/VERSION 1970-01-01 00:00:00 +0000 | |||
77 | +++ plugins/animationplus/VERSION 2016-07-25 17:11:00 +0000 | |||
78 | @@ -0,0 +1,1 @@ | |||
79 | 1 | 0.9.5.0 | ||
80 | 0 | 2 | ||
81 | === added file 'plugins/animationplus/animationplus.xml.in' | |||
82 | --- plugins/animationplus/animationplus.xml.in 1970-01-01 00:00:00 +0000 | |||
83 | +++ plugins/animationplus/animationplus.xml.in 2016-07-25 17:11:00 +0000 | |||
84 | @@ -0,0 +1,185 @@ | |||
85 | 1 | <compiz> | ||
86 | 2 | <!-- animationplus metadata --> | ||
87 | 3 | <plugin name="animationplus" useBcop="true"> | ||
88 | 4 | <_short>Animations Plus</_short> | ||
89 | 5 | <_long>More window animations</_long> | ||
90 | 6 | <category>Effects</category> | ||
91 | 7 | <deps> | ||
92 | 8 | <requirement> | ||
93 | 9 | <plugin>animation</plugin> | ||
94 | 10 | <plugin>animationaddon</plugin> | ||
95 | 11 | </requirement> | ||
96 | 12 | <relation type="after"> | ||
97 | 13 | <plugin>animationaddon</plugin> | ||
98 | 14 | <plugin>opengl</plugin> | ||
99 | 15 | <plugin>composite</plugin> | ||
100 | 16 | </relation> | ||
101 | 17 | </deps> | ||
102 | 18 | |||
103 | 19 | <options> | ||
104 | 20 | |||
105 | 21 | <group> | ||
106 | 22 | <_short>Effect Settings</_short> | ||
107 | 23 | |||
108 | 24 | <subgroup> | ||
109 | 25 | <_short>Helix</_short> | ||
110 | 26 | <option name="helix_num_twists" type="int"> | ||
111 | 27 | <_short>Helix Number of Twists</_short> | ||
112 | 28 | <_long>Number of twists to do in the animation</_long> | ||
113 | 29 | <default>2</default> | ||
114 | 30 | <min>1</min> | ||
115 | 31 | <max>10</max> | ||
116 | 32 | </option> | ||
117 | 33 | <option name="helix_gridy" type="int"> | ||
118 | 34 | <_short>Helix Gridsize Y</_short> | ||
119 | 35 | <_long>Number of blocks in the animation</_long> | ||
120 | 36 | <default>90</default> | ||
121 | 37 | <min>5</min> | ||
122 | 38 | <max>300</max> | ||
123 | 39 | </option> | ||
124 | 40 | <option name="helix_thickness" type="float"> | ||
125 | 41 | <_short>Helix Thickness</_short> | ||
126 | 42 | <_long>Thickness of blocks in the animation</_long> | ||
127 | 43 | <default>0</default> | ||
128 | 44 | <min>0</min> | ||
129 | 45 | <max>50</max> | ||
130 | 46 | </option> | ||
131 | 47 | <option name="helix_spin_direction" type="int"> | ||
132 | 48 | <_short>Spin Direction</_short> | ||
133 | 49 | <_long>Direction the strips spin.</_long> | ||
134 | 50 | <default>1</default> | ||
135 | 51 | <min>0</min> | ||
136 | 52 | <max>1</max> | ||
137 | 53 | <desc> | ||
138 | 54 | <value>0</value> | ||
139 | 55 | <_name>Counter-Clockwise</_name> | ||
140 | 56 | </desc> | ||
141 | 57 | <desc> | ||
142 | 58 | <value>1</value> | ||
143 | 59 | <_name>Clockwise</_name> | ||
144 | 60 | </desc> | ||
145 | 61 | </option> | ||
146 | 62 | <option name="helix_direction" type="bool"> | ||
147 | 63 | <_short>Vertical Helix</_short> | ||
148 | 64 | <_long>Whether Helix should rotate with its axis up/down or in/out of the screen</_long> | ||
149 | 65 | <default>false</default> | ||
150 | 66 | </option> | ||
151 | 67 | </subgroup> | ||
152 | 68 | |||
153 | 69 | |||
154 | 70 | <subgroup> | ||
155 | 71 | <_short>Blinds</_short> | ||
156 | 72 | <option name="blinds_num_halftwists" type="int"> | ||
157 | 73 | <_short>Blinds Number of Half Twists</_short> | ||
158 | 74 | <_long>Number of half twists to do in the animation</_long> | ||
159 | 75 | <default>2</default> | ||
160 | 76 | <min>1</min> | ||
161 | 77 | <max>10</max> | ||
162 | 78 | </option> | ||
163 | 79 | <option name="blinds_gridx" type="int"> | ||
164 | 80 | <_short>Helix Gridsize Y</_short> | ||
165 | 81 | <_long>Number of blocks in the animation</_long> | ||
166 | 82 | <default>20</default> | ||
167 | 83 | <min>1</min> | ||
168 | 84 | <max>100</max> | ||
169 | 85 | </option> | ||
170 | 86 | <option name="blinds_thickness" type="float"> | ||
171 | 87 | <_short>Blinds Thickness</_short> | ||
172 | 88 | <_long>Thickness of blocks in the animation</_long> | ||
173 | 89 | <default>0</default> | ||
174 | 90 | <min>0</min> | ||
175 | 91 | <max>50</max> | ||
176 | 92 | </option> | ||
177 | 93 | </subgroup> | ||
178 | 94 | |||
179 | 95 | <subgroup> | ||
180 | 96 | <_short>Shatter</_short> | ||
181 | 97 | <option name="shatter_num_spokes" type="int"> | ||
182 | 98 | <_short>Shatter number of spokes</_short> | ||
183 | 99 | <_long>Number of spokes (divided by 4) in the animation</_long> | ||
184 | 100 | <default>2</default> | ||
185 | 101 | <min>1</min> | ||
186 | 102 | <max>100</max> | ||
187 | 103 | </option> | ||
188 | 104 | <option name="shatter_num_tiers" type="int"> | ||
189 | 105 | <_short>Shatter Number of Tiers</_short> | ||
190 | 106 | <_long>Number of concentric circles in the animation</_long> | ||
191 | 107 | <default>2</default> | ||
192 | 108 | <min>1</min> | ||
193 | 109 | <max>100</max> | ||
194 | 110 | </option> | ||
195 | 111 | </subgroup> | ||
196 | 112 | |||
197 | 113 | <subgroup> | ||
198 | 114 | <_short>Bonanza</_short> | ||
199 | 115 | <option name="bonanza_particles" type="int"> | ||
200 | 116 | <_short>Number Of Fire Particles</_short> | ||
201 | 117 | <_long>Number of fire particles.</_long> | ||
202 | 118 | <default>1000</default> | ||
203 | 119 | <min>100</min> | ||
204 | 120 | <max>10000</max> | ||
205 | 121 | </option> | ||
206 | 122 | <option name="bonanza_size" type="float"> | ||
207 | 123 | <_short>Fire Particle Size</_short> | ||
208 | 124 | <_long>Fire particle size.</_long> | ||
209 | 125 | <default>5</default> | ||
210 | 126 | <min>0.1</min> | ||
211 | 127 | <max>20</max> | ||
212 | 128 | <precision>0.1</precision> | ||
213 | 129 | </option> | ||
214 | 130 | <option name="bonanza_life" type="float"> | ||
215 | 131 | <_short>Fire Particle Life</_short> | ||
216 | 132 | <_long>Fire particle life.</_long> | ||
217 | 133 | <default>0.7</default> | ||
218 | 134 | <min>0.1</min> | ||
219 | 135 | <max>1</max> | ||
220 | 136 | <precision>0.1</precision> | ||
221 | 137 | </option> | ||
222 | 138 | <option name="bonanza_color" type="color"> | ||
223 | 139 | <_short>Fire Particle Color</_short> | ||
224 | 140 | <_long>Fire particle color.</_long> | ||
225 | 141 | <default> | ||
226 | 142 | <red>0xffff</red> | ||
227 | 143 | <green>0x3333</green> | ||
228 | 144 | <blue>0x0555</blue> | ||
229 | 145 | <alpha>0xffff</alpha> | ||
230 | 146 | </default> | ||
231 | 147 | </option> | ||
232 | 148 | <option name="bonanza_mystical" type="bool"> | ||
233 | 149 | <_short>Randomly Colored Fire</_short> | ||
234 | 150 | <_long>Have random colors for the fire effect, also known as Mystical Fire.</_long> | ||
235 | 151 | <default>false</default> | ||
236 | 152 | </option> | ||
237 | 153 | </subgroup> | ||
238 | 154 | |||
239 | 155 | </group> | ||
240 | 156 | |||
241 | 157 | </options> | ||
242 | 158 | |||
243 | 159 | <extension base_plugin="animation"> | ||
244 | 160 | <base_option>open_effects</base_option> | ||
245 | 161 | <base_option>open_random_effects</base_option> | ||
246 | 162 | <base_option>close_effects</base_option> | ||
247 | 163 | <base_option>close_random_effects</base_option> | ||
248 | 164 | <base_option>minimize_effects</base_option> | ||
249 | 165 | <base_option>minimize_random_effects</base_option> | ||
250 | 166 | <restriction> | ||
251 | 167 | <value>animationplus:Blinds</value> | ||
252 | 168 | <_name>Blinds</_name> | ||
253 | 169 | </restriction> | ||
254 | 170 | <restriction> | ||
255 | 171 | <value>animationplus:Helix</value> | ||
256 | 172 | <_name>Helix</_name> | ||
257 | 173 | </restriction> | ||
258 | 174 | <restriction> | ||
259 | 175 | <value>animationplus:Bonanza</value> | ||
260 | 176 | <_name>Bonanza</_name> | ||
261 | 177 | </restriction> | ||
262 | 178 | <restriction> | ||
263 | 179 | <value>animationplus:Shatter</value> | ||
264 | 180 | <_name>Shatter</_name> | ||
265 | 181 | </restriction> | ||
266 | 182 | </extension> | ||
267 | 183 | |||
268 | 184 | </plugin> | ||
269 | 185 | </compiz> | ||
270 | 0 | 186 | ||
271 | === added directory 'plugins/animationplus/src' | |||
272 | === added file 'plugins/animationplus/src/animation_tex.h' | |||
273 | --- plugins/animationplus/src/animation_tex.h 1970-01-01 00:00:00 +0000 | |||
274 | +++ plugins/animationplus/src/animation_tex.h 2016-07-25 17:11:00 +0000 | |||
275 | @@ -0,0 +1,222 @@ | |||
276 | 1 | /** | ||
277 | 2 | * | ||
278 | 3 | * Particle texture for Beryl benchmark plugin | ||
279 | 4 | * | ||
280 | 5 | * Copyright : (C) 2006 by Dennis Kasprzyk | ||
281 | 6 | * E-mail : onestone@beryl-project.org | ||
282 | 7 | * | ||
283 | 8 | * | ||
284 | 9 | * This program is free software; you can redistribute it and/or | ||
285 | 10 | * modify it under the terms of the GNU General Public License | ||
286 | 11 | * as published by the Free Software Foundation; either version 2 | ||
287 | 12 | * of the License, or (at your option) any later version. | ||
288 | 13 | * | ||
289 | 14 | * This program is distributed in the hope that it will be useful, | ||
290 | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
291 | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
292 | 17 | * GNU General Public License for more details. | ||
293 | 18 | * | ||
294 | 19 | **/ | ||
295 | 20 | |||
296 | 21 | static const unsigned char fireTex[4097] = { | ||
297 | 22 | "\0\0\0\0\377\377\377\3\377\377\377\2\377\377\377\5\377\377\377\7\377\377" | ||
298 | 23 | "\377\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\11\377\377" | ||
299 | 24 | "\377\12\377\377\377\12\377\377\377\14\377\377\377\14\377\377\377\14\377\377" | ||
300 | 25 | "\377\16\377\377\377\15\377\377\377\14\377\377\377\12\377\377\377\13\377\377" | ||
301 | 26 | "\377\13\377\377\377\11\377\377\377\12\377\377\377\12\377\377\377\10\377\377" | ||
302 | 27 | "\377\7\377\377\377\6\377\377\377\6\377\377\377\5\377\377\377\2\0\0\0\0\0" | ||
303 | 28 | "\0\0\0\377\377\377\4\377\377\377\3\377\377\377\4\377\377\377\7\377\377\377" | ||
304 | 29 | "\6\377\377\377\10\377\377\377\11\377\377\377\11\377\377\377\14\377\377\377" | ||
305 | 30 | "\14\377\377\377\15\377\377\377\16\377\377\377\20\377\377\377\21\377\377\377" | ||
306 | 31 | "\20\377\377\377\22\377\377\377\20\377\377\377\21\377\377\377\17\377\377\377" | ||
307 | 32 | "\20\377\377\377\17\377\377\377\13\377\377\377\13\377\377\377\13\377\377\377" | ||
308 | 33 | "\14\377\377\377\11\377\377\377\6\377\377\377\6\377\377\377\6\377\377\377" | ||
309 | 34 | "\4\377\377\377\1\0\0\0\0\377\377\377\5\377\377\377\4\377\377\377\6\377\377" | ||
310 | 35 | "\377\6\377\377\377\12\377\377\377\12\377\377\377\11\377\377\377\14\377\377" | ||
311 | 36 | "\377\15\377\377\377\20\377\377\377\20\377\377\377\24\377\377\377\24\377\377" | ||
312 | 37 | "\377\23\377\377\377\23\377\377\377\26\377\377\377\25\377\377\377\23\377\377" | ||
313 | 38 | "\377\21\377\377\377\24\377\377\377\22\377\377\377\17\377\377\377\17\377\377" | ||
314 | 39 | "\377\15\377\377\377\15\377\377\377\11\377\377\377\11\377\377\377\7\377\377" | ||
315 | 40 | "\377\7\377\377\377\6\377\377\377\3\377\377\377\3\377\377\377\6\377\377\377" | ||
316 | 41 | "\6\377\377\377\6\377\377\377\12\377\377\377\13\377\377\377\13\377\377\377" | ||
317 | 42 | "\13\377\377\377\17\377\377\377\22\377\377\377\24\377\377\377\22\377\377\377" | ||
318 | 43 | "\30\377\377\377\30\377\377\377\31\377\377\377\31\377\377\377\33\377\377\377" | ||
319 | 44 | "\31\377\377\377\30\377\377\377\30\377\377\377\30\377\377\377\25\377\377\377" | ||
320 | 45 | "\25\377\377\377\23\377\377\377\22\377\377\377\17\377\377\377\13\377\377\377" | ||
321 | 46 | "\12\377\377\377\11\377\377\377\7\377\377\377\6\377\377\377\5\377\377\377" | ||
322 | 47 | "\4\377\377\377\7\377\377\377\6\377\377\377\12\377\377\377\11\377\377\377" | ||
323 | 48 | "\14\377\377\377\15\377\377\377\20\377\377\377\22\377\377\377\25\377\377\377" | ||
324 | 49 | "\30\377\377\377\32\377\377\377\35\377\377\377\34\377\377\377\34\377\377\377" | ||
325 | 50 | "\36\377\377\377\40\377\377\377\36\377\377\377\34\377\377\377\34\377\377\377" | ||
326 | 51 | "\34\377\377\377\32\377\377\377\31\377\377\377\26\377\377\377\25\377\377\377" | ||
327 | 52 | "\22\377\377\377\16\377\377\377\12\377\377\377\12\377\377\377\12\377\377\377" | ||
328 | 53 | "\10\377\377\377\6\377\377\377\4\377\377\377\10\377\377\377\11\377\377\377" | ||
329 | 54 | "\12\377\377\377\13\377\377\377\16\377\377\377\21\377\377\377\22\377\377\377" | ||
330 | 55 | "\25\377\377\377\30\377\377\377\34\377\377\377\37\377\377\377!\377\377\377" | ||
331 | 56 | "\"\377\377\377#\377\377\377#\377\377\377&\377\377\377&\377\377\377$\377\377" | ||
332 | 57 | "\377#\377\377\377\40\377\377\377!\377\377\377\35\377\377\377\34\377\377\377" | ||
333 | 58 | "\25\377\377\377\24\377\377\377\21\377\377\377\15\377\377\377\14\377\377\377" | ||
334 | 59 | "\14\377\377\377\12\377\377\377\6\377\377\377\6\377\377\377\10\377\377\377" | ||
335 | 60 | "\12\377\377\377\12\377\377\377\16\377\377\377\22\377\377\377\24\377\377\377" | ||
336 | 61 | "\26\377\377\377\30\377\377\377\34\377\377\377\37\377\377\377#\377\377\377" | ||
337 | 62 | "&\377\377\377,\377\377\377+\377\377\377,\377\377\377-\377\377\377-\377\377" | ||
338 | 63 | "\377,\377\377\377+\377\377\377&\377\377\377)\377\377\377$\377\377\377\34" | ||
339 | 64 | "\377\377\377\34\377\377\377\27\377\377\377\24\377\377\377\23\377\377\377" | ||
340 | 65 | "\17\377\377\377\15\377\377\377\12\377\377\377\7\377\377\377\6\377\377\377" | ||
341 | 66 | "\12\377\377\377\12\377\377\377\16\377\377\377\21\377\377\377\22\377\377\377" | ||
342 | 67 | "\27\377\377\377\31\377\377\377\36\377\377\377!\377\377\377%\377\377\377(" | ||
343 | 68 | "\377\377\3771\377\377\3772\377\377\3775\377\377\377;\377\377\377<\377\377" | ||
344 | 69 | "\3779\377\377\3778\377\377\3773\377\377\3771\377\377\377-\377\377\377'\377" | ||
345 | 70 | "\377\377\"\377\377\377\34\377\377\377\36\377\377\377\32\377\377\377\25\377" | ||
346 | 71 | "\377\377\21\377\377\377\15\377\377\377\11\377\377\377\12\377\377\377\7\377" | ||
347 | 72 | "\377\377\13\377\377\377\14\377\377\377\17\377\377\377\21\377\377\377\31\377" | ||
348 | 73 | "\377\377\31\377\377\377\35\377\377\377!\377\377\377'\377\377\377+\377\377" | ||
349 | 74 | "\3771\377\377\377=\377\377\377E\377\377\377H\377\377\377M\377\377\377M\377" | ||
350 | 75 | "\377\377J\377\377\377I\377\377\377A\377\377\377A\377\377\3778\377\377\377" | ||
351 | 76 | ",\377\377\377%\377\377\377$\377\377\377\"\377\377\377\34\377\377\377\24\377" | ||
352 | 77 | "\377\377\22\377\377\377\17\377\377\377\13\377\377\377\12\377\377\377\11\377" | ||
353 | 78 | "\377\377\13\377\377\377\14\377\377\377\20\377\377\377\23\377\377\377\27\377" | ||
354 | 79 | "\377\377\35\377\377\377$\377\377\377(\377\377\377.\377\377\3776\377\377\377" | ||
355 | 80 | "=\377\377\377H\377\377\377W\377\377\377Y\377\377\377]\377\377\377a\377\377" | ||
356 | 81 | "\377\\\377\377\377\\\377\377\377U\377\377\377O\377\377\377?\377\377\3774" | ||
357 | 82 | "\377\377\377-\377\377\377+\377\377\377\40\377\377\377\32\377\377\377\27\377" | ||
358 | 83 | "\377\377\23\377\377\377\22\377\377\377\15\377\377\377\11\377\377\377\13\377" | ||
359 | 84 | "\377\377\12\377\377\377\15\377\377\377\21\377\377\377\25\377\377\377\30\377" | ||
360 | 85 | "\377\377\37\377\377\377$\377\377\377.\377\377\3779\377\377\377?\377\377\377" | ||
361 | 86 | "N\377\377\377X\377\377\377h\377\377\377r\377\377\377w\377\377\377|\377\377" | ||
362 | 87 | "\377x\377\377\377p\377\377\377k\377\377\377\\\377\377\377J\377\377\377F\377" | ||
363 | 88 | "\377\3779\377\377\377*\377\377\377$\377\377\377\36\377\377\377\30\377\377" | ||
364 | 89 | "\377\25\377\377\377\24\377\377\377\20\377\377\377\14\377\377\377\12\377\377" | ||
365 | 90 | "\377\15\377\377\377\17\377\377\377\22\377\377\377\27\377\377\377\34\377\377" | ||
366 | 91 | "\377\40\377\377\377%\377\377\377.\377\377\377<\377\377\377M\377\377\377[" | ||
367 | 92 | "\377\377\377l\377\377\377~\377\377\377\227\377\377\377\230\377\377\377\234" | ||
368 | 93 | "\377\377\377\233\377\377\377\226\377\377\377\205\377\377\377i\377\377\377" | ||
369 | 94 | "b\377\377\377P\377\377\3779\377\377\377-\377\377\377(\377\377\377!\377\377" | ||
370 | 95 | "\377\35\377\377\377\32\377\377\377\25\377\377\377\21\377\377\377\13\377\377" | ||
371 | 96 | "\377\12\377\377\377\15\377\377\377\21\377\377\377\23\377\377\377\31\377\377" | ||
372 | 97 | "\377\37\377\377\377!\377\377\377(\377\377\3774\377\377\377@\377\377\377Q" | ||
373 | 98 | "\377\377\377g\377\377\377\200\377\377\377\231\377\377\377\254\377\377\377" | ||
374 | 99 | "\275\377\377\377\310\377\377\377\304\377\377\377\264\377\377\377\227\377" | ||
375 | 100 | "\377\377\212\377\377\377f\377\377\377Q\377\377\377B\377\377\377:\377\377" | ||
376 | 101 | "\377/\377\377\377&\377\377\377\36\377\377\377\32\377\377\377\26\377\377\377" | ||
377 | 102 | "\21\377\377\377\14\377\377\377\12\377\377\377\17\377\377\377\22\377\377\377" | ||
378 | 103 | "\24\377\377\377\31\377\377\377\40\377\377\377&\377\377\377-\377\377\377:" | ||
379 | 104 | "\377\377\377H\377\377\377X\377\377\377k\377\377\377\220\377\377\377\252\377" | ||
380 | 105 | "\377\377\324\377\377\377\363\377\377\377\370\377\377\377\366\377\377\377" | ||
381 | 106 | "\335\377\377\377\263\377\377\377\221\377\377\377w\377\377\377b\377\377\377" | ||
382 | 107 | "P\377\377\377>\377\377\3770\377\377\377&\377\377\377\37\377\377\377\32\377" | ||
383 | 108 | "\377\377\26\377\377\377\23\377\377\377\15\377\377\377\11\377\377\377\16\377" | ||
384 | 109 | "\377\377\21\377\377\377\27\377\377\377\33\377\377\377\"\377\377\377(\377" | ||
385 | 110 | "\377\377/\377\377\377<\377\377\377N\377\377\377b\377\377\377z\377\377\377" | ||
386 | 111 | "\231\377\377\377\275\377\377\377\361\377\377\377\375\377\377\377\376\377" | ||
387 | 112 | "\377\377\376\377\377\377\370\377\377\377\316\377\377\377\240\377\377\377" | ||
388 | 113 | "\205\377\377\377b\377\377\377L\377\377\377<\377\377\377.\377\377\377&\377" | ||
389 | 114 | "\377\377\40\377\377\377\33\377\377\377\26\377\377\377\22\377\377\377\15\377" | ||
390 | 115 | "\377\377\12\377\377\377\16\377\377\377\22\377\377\377\24\377\377\377\32\377" | ||
391 | 116 | "\377\377\40\377\377\377$\377\377\377,\377\377\377:\377\377\377L\377\377\377" | ||
392 | 117 | "`\377\377\377|\377\377\377\231\377\377\377\310\377\377\377\372\377\377\377" | ||
393 | 118 | "\375\377\377\377\376\377\377\377\376\377\377\377\375\377\377\377\332\377" | ||
394 | 119 | "\377\377\241\377\377\377\207\377\377\377f\377\377\377R\377\377\377@\377\377" | ||
395 | 120 | "\3773\377\377\377+\377\377\377\"\377\377\377\35\377\377\377\30\377\377\377" | ||
396 | 121 | "\24\377\377\377\17\377\377\377\14\377\377\377\16\377\377\377\22\377\377\377" | ||
397 | 122 | "\25\377\377\377\30\377\377\377\40\377\377\377$\377\377\377,\377\377\377;" | ||
398 | 123 | "\377\377\377N\377\377\377e\377\377\377\206\377\377\377\246\377\377\377\327" | ||
399 | 124 | "\377\377\377\374\377\377\377\375\377\377\377\376\377\377\377\376\377\377" | ||
400 | 125 | "\377\374\377\377\377\331\377\377\377\243\377\377\377\210\377\377\377b\377" | ||
401 | 126 | "\377\377O\377\377\377>\377\377\377.\377\377\377&\377\377\377\40\377\377\377" | ||
402 | 127 | "\33\377\377\377\27\377\377\377\22\377\377\377\15\377\377\377\12\377\377\377" | ||
403 | 128 | "\16\377\377\377\22\377\377\377\23\377\377\377\32\377\377\377\40\377\377\377" | ||
404 | 129 | "'\377\377\3770\377\377\377?\377\377\377U\377\377\377h\377\377\377\200\377" | ||
405 | 130 | "\377\377\237\377\377\377\270\377\377\377\344\377\377\377\372\377\377\377" | ||
406 | 131 | "\375\377\377\377\376\377\377\377\354\377\377\377\275\377\377\377\227\377" | ||
407 | 132 | "\377\377\200\377\377\377e\377\377\377Q\377\377\377>\377\377\377.\377\377" | ||
408 | 133 | "\377%\377\377\377\40\377\377\377\33\377\377\377\26\377\377\377\22\377\377" | ||
409 | 134 | "\377\15\377\377\377\11\377\377\377\17\377\377\377\22\377\377\377\25\377\377" | ||
410 | 135 | "\377\31\377\377\377\"\377\377\377*\377\377\3773\377\377\377=\377\377\377" | ||
411 | 136 | "J\377\377\377^\377\377\377o\377\377\377\211\377\377\377\235\377\377\377\271" | ||
412 | 137 | "\377\377\377\327\377\377\377\342\377\377\377\335\377\377\377\302\377\377" | ||
413 | 138 | "\377\240\377\377\377\216\377\377\377k\377\377\377X\377\377\377C\377\377\377" | ||
414 | 139 | "9\377\377\377/\377\377\377&\377\377\377\"\377\377\377\33\377\377\377\26\377" | ||
415 | 140 | "\377\377\22\377\377\377\14\377\377\377\12\377\377\377\15\377\377\377\22\377" | ||
416 | 141 | "\377\377\31\377\377\377\35\377\377\377\37\377\377\377$\377\377\377,\377\377" | ||
417 | 142 | "\3777\377\377\377A\377\377\377Q\377\377\377[\377\377\377p\377\377\377\212" | ||
418 | 143 | "\377\377\377\231\377\377\377\242\377\377\377\253\377\377\377\251\377\377" | ||
419 | 144 | "\377\236\377\377\377\215\377\377\377u\377\377\377b\377\377\377O\377\377\377" | ||
420 | 145 | "<\377\377\3771\377\377\377)\377\377\377\"\377\377\377\34\377\377\377\32\377" | ||
421 | 146 | "\377\377\27\377\377\377\21\377\377\377\16\377\377\377\12\377\377\377\17\377" | ||
422 | 147 | "\377\377\21\377\377\377\20\377\377\377\27\377\377\377\37\377\377\377$\377" | ||
423 | 148 | "\377\377&\377\377\377,\377\377\3778\377\377\377B\377\377\377R\377\377\377" | ||
424 | 149 | "_\377\377\377k\377\377\377~\377\377\377\207\377\377\377\220\377\377\377\220" | ||
425 | 150 | "\377\377\377\203\377\377\377q\377\377\377_\377\377\377V\377\377\377F\377" | ||
426 | 151 | "\377\3777\377\377\377,\377\377\377%\377\377\377!\377\377\377\31\377\377\377" | ||
427 | 152 | "\25\377\377\377\22\377\377\377\17\377\377\377\14\377\377\377\11\377\377\377" | ||
428 | 153 | "\12\377\377\377\16\377\377\377\22\377\377\377\27\377\377\377\33\377\377\377" | ||
429 | 154 | "\35\377\377\377\"\377\377\377(\377\377\377/\377\377\3779\377\377\377E\377" | ||
430 | 155 | "\377\377L\377\377\377^\377\377\377d\377\377\377e\377\377\377k\377\377\377" | ||
431 | 156 | "l\377\377\377d\377\377\377a\377\377\377O\377\377\377C\377\377\377=\377\377" | ||
432 | 157 | "\3770\377\377\377)\377\377\377$\377\377\377\35\377\377\377\30\377\377\377" | ||
433 | 158 | "\25\377\377\377\22\377\377\377\16\377\377\377\12\377\377\377\13\377\377\377" | ||
434 | 159 | "\13\377\377\377\15\377\377\377\20\377\377\377\21\377\377\377\31\377\377\377" | ||
435 | 160 | "\33\377\377\377\35\377\377\377$\377\377\377)\377\377\3771\377\377\3776\377" | ||
436 | 161 | "\377\377@\377\377\377J\377\377\377N\377\377\377P\377\377\377S\377\377\377" | ||
437 | 162 | "X\377\377\377P\377\377\377J\377\377\377E\377\377\3777\377\377\377,\377\377" | ||
438 | 163 | "\377+\377\377\377%\377\377\377\40\377\377\377\32\377\377\377\26\377\377\377" | ||
439 | 164 | "\21\377\377\377\21\377\377\377\14\377\377\377\11\377\377\377\12\377\377\377" | ||
440 | 165 | "\13\377\377\377\11\377\377\377\14\377\377\377\21\377\377\377\23\377\377\377" | ||
441 | 166 | "\27\377\377\377\33\377\377\377\37\377\377\377&\377\377\377(\377\377\377*" | ||
442 | 167 | "\377\377\3774\377\377\3779\377\377\377<\377\377\377=\377\377\377C\377\377" | ||
443 | 168 | "\377E\377\377\377?\377\377\3779\377\377\377:\377\377\377.\377\377\377(\377" | ||
444 | 169 | "\377\377!\377\377\377!\377\377\377\35\377\377\377\31\377\377\377\24\377\377" | ||
445 | 170 | "\377\21\377\377\377\16\377\377\377\12\377\377\377\11\377\377\377\10\377\377" | ||
446 | 171 | "\377\10\377\377\377\11\377\377\377\13\377\377\377\16\377\377\377\22\377\377" | ||
447 | 172 | "\377\25\377\377\377\30\377\377\377\33\377\377\377\"\377\377\377!\377\377" | ||
448 | 173 | "\377%\377\377\377*\377\377\377-\377\377\3770\377\377\377/\377\377\3773\377" | ||
449 | 174 | "\377\3772\377\377\3774\377\377\377-\377\377\377,\377\377\377*\377\377\377" | ||
450 | 175 | "\"\377\377\377\37\377\377\377\32\377\377\377\33\377\377\377\27\377\377\377" | ||
451 | 176 | "\21\377\377\377\17\377\377\377\16\377\377\377\12\377\377\377\11\377\377\377" | ||
452 | 177 | "\6\377\377\377\10\377\377\377\12\377\377\377\11\377\377\377\15\377\377\377" | ||
453 | 178 | "\20\377\377\377\22\377\377\377\23\377\377\377\30\377\377\377\32\377\377\377" | ||
454 | 179 | "\35\377\377\377\40\377\377\377!\377\377\377%\377\377\377(\377\377\377&\377" | ||
455 | 180 | "\377\377)\377\377\377(\377\377\377+\377\377\377$\377\377\377!\377\377\377" | ||
456 | 181 | "#\377\377\377\36\377\377\377\30\377\377\377\30\377\377\377\24\377\377\377" | ||
457 | 182 | "\22\377\377\377\20\377\377\377\15\377\377\377\11\377\377\377\12\377\377\377" | ||
458 | 183 | "\6\377\377\377\6\377\377\377\7\377\377\377\7\377\377\377\11\377\377\377\12" | ||
459 | 184 | "\377\377\377\16\377\377\377\17\377\377\377\22\377\377\377\23\377\377\377" | ||
460 | 185 | "\26\377\377\377\31\377\377\377\33\377\377\377\34\377\377\377!\377\377\377" | ||
461 | 186 | "\40\377\377\377\"\377\377\377\"\377\377\377\"\377\377\377&\377\377\377\36" | ||
462 | 187 | "\377\377\377\35\377\377\377\35\377\377\377\34\377\377\377\26\377\377\377" | ||
463 | 188 | "\24\377\377\377\23\377\377\377\20\377\377\377\15\377\377\377\14\377\377\377" | ||
464 | 189 | "\13\377\377\377\7\377\377\377\5\377\377\377\6\377\377\377\7\377\377\377\6" | ||
465 | 190 | "\377\377\377\11\377\377\377\12\377\377\377\11\377\377\377\15\377\377\377" | ||
466 | 191 | "\16\377\377\377\21\377\377\377\22\377\377\377\26\377\377\377\26\377\377\377" | ||
467 | 192 | "\30\377\377\377\33\377\377\377\32\377\377\377\34\377\377\377\33\377\377\377" | ||
468 | 193 | "\32\377\377\377\37\377\377\377\31\377\377\377\31\377\377\377\27\377\377\377" | ||
469 | 194 | "\30\377\377\377\21\377\377\377\22\377\377\377\17\377\377\377\14\377\377\377" | ||
470 | 195 | "\11\377\377\377\11\377\377\377\12\377\377\377\6\377\377\377\6\377\377\377" | ||
471 | 196 | "\4\377\377\377\6\377\377\377\6\377\377\377\5\377\377\377\7\377\377\377\13" | ||
472 | 197 | "\377\377\377\11\377\377\377\12\377\377\377\16\377\377\377\21\377\377\377" | ||
473 | 198 | "\21\377\377\377\20\377\377\377\22\377\377\377\30\377\377\377\26\377\377\377" | ||
474 | 199 | "\27\377\377\377\30\377\377\377\27\377\377\377\30\377\377\377\26\377\377\377" | ||
475 | 200 | "\23\377\377\377\22\377\377\377\20\377\377\377\20\377\377\377\16\377\377\377" | ||
476 | 201 | "\14\377\377\377\11\377\377\377\11\377\377\377\10\377\377\377\6\377\377\377" | ||
477 | 202 | "\6\377\377\377\4\377\377\377\3\377\377\377\4\377\377\377\4\377\377\377\4" | ||
478 | 203 | "\377\377\377\7\377\377\377\10\377\377\377\12\377\377\377\10\377\377\377\11" | ||
479 | 204 | "\377\377\377\15\377\377\377\16\377\377\377\16\377\377\377\20\377\377\377" | ||
480 | 205 | "\23\377\377\377\21\377\377\377\23\377\377\377\22\377\377\377\22\377\377\377" | ||
481 | 206 | "\21\377\377\377\22\377\377\377\22\377\377\377\20\377\377\377\16\377\377\377" | ||
482 | 207 | "\15\377\377\377\12\377\377\377\11\377\377\377\12\377\377\377\7\377\377\377" | ||
483 | 208 | "\6\377\377\377\7\377\377\377\5\377\377\377\4\377\377\377\1\377\377\377\1" | ||
484 | 209 | "\377\377\377\3\377\377\377\3\377\377\377\6\377\377\377\7\377\377\377\6\377" | ||
485 | 210 | "\377\377\10\377\377\377\12\377\377\377\12\377\377\377\11\377\377\377\13\377" | ||
486 | 211 | "\377\377\16\377\377\377\16\377\377\377\16\377\377\377\17\377\377\377\16\377" | ||
487 | 212 | "\377\377\16\377\377\377\17\377\377\377\17\377\377\377\15\377\377\377\14\377" | ||
488 | 213 | "\377\377\12\377\377\377\11\377\377\377\12\377\377\377\12\377\377\377\7\377" | ||
489 | 214 | "\377\377\6\377\377\377\6\377\377\377\6\377\377\377\3\377\377\377\1\377\377" | ||
490 | 215 | "\377\1\0\0\0\0\0\0\0\0\377\377\377\2\377\377\377\4\377\377\377\7\377\377" | ||
491 | 216 | "\377\6\377\377\377\6\377\377\377\7\377\377\377\13\377\377\377\13\377\377" | ||
492 | 217 | "\377\10\377\377\377\11\377\377\377\11\377\377\377\11\377\377\377\15\377\377" | ||
493 | 218 | "\377\13\377\377\377\14\377\377\377\11\377\377\377\13\377\377\377\11\377\377" | ||
494 | 219 | "\377\12\377\377\377\13\377\377\377\11\377\377\377\11\377\377\377\6\377\377" | ||
495 | 220 | "\377\7\377\377\377\4\377\377\377\5\377\377\377\3\377\377\377\1\0\0\0\0\0" | ||
496 | 221 | "\0\0\0" | ||
497 | 222 | }; | ||
498 | 0 | 223 | ||
499 | === added file 'plugins/animationplus/src/animationplus.cpp' | |||
500 | --- plugins/animationplus/src/animationplus.cpp 1970-01-01 00:00:00 +0000 | |||
501 | +++ plugins/animationplus/src/animationplus.cpp 2016-07-25 17:11:00 +0000 | |||
502 | @@ -0,0 +1,158 @@ | |||
503 | 1 | /** | ||
504 | 2 | * Example Animation extension plugin for compiz | ||
505 | 3 | * | ||
506 | 4 | * | ||
507 | 5 | * This program is free software; you can redistribute it and/or | ||
508 | 6 | * modify it under the terms of the GNU General Public License | ||
509 | 7 | * as published by the Free Software Foundation; either version 2 | ||
510 | 8 | * of the License, or (at your option) any later version. | ||
511 | 9 | * | ||
512 | 10 | * This program is distributed in the hope that it will be useful, | ||
513 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
514 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
515 | 13 | * GNU General Public License for more details. | ||
516 | 14 | * | ||
517 | 15 | * You should have received a copy of the GNU General Public License | ||
518 | 16 | * along with this program; if not, write to the Free Software | ||
519 | 17 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
520 | 18 | **/ | ||
521 | 19 | |||
522 | 20 | #ifdef HAVE_CONFIG_H | ||
523 | 21 | #include <config.h> | ||
524 | 22 | #endif | ||
525 | 23 | |||
526 | 24 | #include <limits.h> | ||
527 | 25 | #include "private.h" | ||
528 | 26 | |||
529 | 27 | COMPIZ_PLUGIN_20090315 (animationplus, AnimPlusPluginVTable); | ||
530 | 28 | |||
531 | 29 | AnimEffect animEffects[NUM_EFFECTS]; | ||
532 | 30 | |||
533 | 31 | ExtensionPluginAnimPlus animPlusExtPluginInfo (CompString ("animationplus"), | ||
534 | 32 | NUM_EFFECTS, animEffects, NULL, | ||
535 | 33 | NUM_NONEFFECT_OPTIONS); | ||
536 | 34 | |||
537 | 35 | ExtensionPluginInfo * | ||
538 | 36 | BasePlusAnim::getExtensionPluginInfo () | ||
539 | 37 | { | ||
540 | 38 | return &animPlusExtPluginInfo; | ||
541 | 39 | } | ||
542 | 40 | |||
543 | 41 | BasePlusAnim::BasePlusAnim (CompWindow *w, | ||
544 | 42 | WindowEvent curWindowEvent, | ||
545 | 43 | float duration, | ||
546 | 44 | const AnimEffect info, | ||
547 | 45 | const CompRect &icon) : | ||
548 | 46 | Animation::Animation (w, curWindowEvent, duration, info, icon), | ||
549 | 47 | mCScreen (CompositeScreen::get (::screen)), | ||
550 | 48 | mGScreen (GLScreen::get (::screen)) | ||
551 | 49 | { | ||
552 | 50 | } | ||
553 | 51 | |||
554 | 52 | /* | ||
555 | 53 | // For effects with custom polygon step functions: | ||
556 | 54 | AnimExtEffectProperties fxAirplaneExtraProp = { | ||
557 | 55 | .animStepPolygonFunc = fxAirplaneLinearAnimStepPolygon}; | ||
558 | 56 | */ | ||
559 | 57 | |||
560 | 58 | AnimEffect AnimEffectBlinds; | ||
561 | 59 | AnimEffect AnimEffectHelix; | ||
562 | 60 | AnimEffect AnimEffectShatter; | ||
563 | 61 | AnimEffect AnimEffectBonanza; | ||
564 | 62 | |||
565 | 63 | void | ||
566 | 64 | AnimPlusScreen::initAnimationList () | ||
567 | 65 | { | ||
568 | 66 | int i = 0; | ||
569 | 67 | |||
570 | 68 | AnimEffectUsedFor usedFor = AnimEffectUsedFor::all () | ||
571 | 69 | .exclude (AnimEventShade) | ||
572 | 70 | .exclude (AnimEventFocus); | ||
573 | 71 | |||
574 | 72 | animEffects[i++] = AnimEffectBlinds = | ||
575 | 73 | new AnimEffectInfo ("animationplus:Blinds", | ||
576 | 74 | usedFor, | ||
577 | 75 | &createAnimation <BlindsAnim>); | ||
578 | 76 | |||
579 | 77 | /* Currently broken */ | ||
580 | 78 | animEffects[i++] = AnimEffectBonanza = | ||
581 | 79 | new AnimEffectInfo ("animationplus:Bonanza", | ||
582 | 80 | usedFor, | ||
583 | 81 | &createAnimation <BonanzaAnim>); | ||
584 | 82 | |||
585 | 83 | animEffects[i++] = AnimEffectHelix = | ||
586 | 84 | new AnimEffectInfo ("animationplus:Helix", | ||
587 | 85 | usedFor, | ||
588 | 86 | &createAnimation <HelixAnim>); | ||
589 | 87 | |||
590 | 88 | animEffects[i++] = AnimEffectShatter = | ||
591 | 89 | new AnimEffectInfo ("animationplus:Shatter", | ||
592 | 90 | usedFor, | ||
593 | 91 | &createAnimation <ShatterAnim>); | ||
594 | 92 | |||
595 | 93 | animPlusExtPluginInfo.effectOptions = &getOptions (); | ||
596 | 94 | |||
597 | 95 | AnimScreen *as = AnimScreen::get (::screen); | ||
598 | 96 | |||
599 | 97 | as->addExtension (&animPlusExtPluginInfo); | ||
600 | 98 | } | ||
601 | 99 | |||
602 | 100 | AnimPlusScreen::AnimPlusScreen (CompScreen *s) : | ||
603 | 101 | //cScreen (CompositeScreen::get (s)), | ||
604 | 102 | //gScreen (GLScreen::get (s)), | ||
605 | 103 | //aScreen (as), | ||
606 | 104 | PluginClassHandler <AnimPlusScreen, CompScreen> (s), | ||
607 | 105 | mOutput (s->fullscreenOutput ()) | ||
608 | 106 | { | ||
609 | 107 | initAnimationList (); | ||
610 | 108 | } | ||
611 | 109 | |||
612 | 110 | AnimPlusScreen::~AnimPlusScreen () | ||
613 | 111 | { | ||
614 | 112 | AnimScreen *as = AnimScreen::get (::screen); | ||
615 | 113 | |||
616 | 114 | as->removeExtension (&animPlusExtPluginInfo); | ||
617 | 115 | |||
618 | 116 | for (int i = 0; i < NUM_EFFECTS; i++) | ||
619 | 117 | { | ||
620 | 118 | delete animEffects[i]; | ||
621 | 119 | animEffects[i] = NULL; | ||
622 | 120 | } | ||
623 | 121 | } | ||
624 | 122 | |||
625 | 123 | AnimPlusWindow::AnimPlusWindow (CompWindow *w) : | ||
626 | 124 | PluginClassHandler<AnimPlusWindow, CompWindow> (w), | ||
627 | 125 | mWindow (w), | ||
628 | 126 | aWindow (AnimWindow::get (w)) | ||
629 | 127 | { | ||
630 | 128 | } | ||
631 | 129 | |||
632 | 130 | AnimPlusWindow::~AnimPlusWindow () | ||
633 | 131 | { | ||
634 | 132 | Animation *curAnim = aWindow->curAnimation (); | ||
635 | 133 | |||
636 | 134 | if (!curAnim) | ||
637 | 135 | return; | ||
638 | 136 | |||
639 | 137 | // We need to interrupt and clean up the animation currently being played | ||
640 | 138 | // by animationsim for this window (if any) | ||
641 | 139 | if (curAnim->remainingTime () > 0 && | ||
642 | 140 | curAnim->getExtensionPluginInfo ()->name == | ||
643 | 141 | CompString ("animationplus")) | ||
644 | 142 | { | ||
645 | 143 | aWindow->postAnimationCleanUp (); | ||
646 | 144 | } | ||
647 | 145 | } | ||
648 | 146 | |||
649 | 147 | bool | ||
650 | 148 | AnimPlusPluginVTable::init () | ||
651 | 149 | { | ||
652 | 150 | if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) || | ||
653 | 151 | !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) || | ||
654 | 152 | !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) || | ||
655 | 153 | !CompPlugin::checkPluginABI ("animation", ANIMATION_ABI) || | ||
656 | 154 | !CompPlugin::checkPluginABI ("animationaddon", ANIMATIONADDON_ABI)) | ||
657 | 155 | return false; | ||
658 | 156 | |||
659 | 157 | return true; | ||
660 | 158 | } | ||
661 | 0 | 159 | ||
662 | === added file 'plugins/animationplus/src/blinds.cpp' | |||
663 | --- plugins/animationplus/src/blinds.cpp 1970-01-01 00:00:00 +0000 | |||
664 | +++ plugins/animationplus/src/blinds.cpp 2016-07-25 17:11:00 +0000 | |||
665 | @@ -0,0 +1,70 @@ | |||
666 | 1 | /* | ||
667 | 2 | * Animation plugin for compiz/beryl | ||
668 | 3 | * | ||
669 | 4 | * blinds.cpp | ||
670 | 5 | * | ||
671 | 6 | * Copyright : (C) 2008 Kevin DuBois | ||
672 | 7 | * E-mail : kdub432@gmail.com | ||
673 | 8 | * | ||
674 | 9 | * Based on other animations by | ||
675 | 10 | * : Erkin Bahceci | ||
676 | 11 | * E-mail : erkinbah@gmail.com | ||
677 | 12 | * | ||
678 | 13 | * Which were based on Wobbly and Minimize plugins by | ||
679 | 14 | * : David Reveman | ||
680 | 15 | * E-mail : davidr@novell.com> | ||
681 | 16 | * | ||
682 | 17 | * This program is free software; you can redistribute it and/or | ||
683 | 18 | * modify it under the terms of the GNU General Public License | ||
684 | 19 | * as published by the Free Software Foundation; either version 2 | ||
685 | 20 | * of the License, or (at your option) any later version. | ||
686 | 21 | *const float ExplodeAnim::kDurationFactor = 1.43; | ||
687 | 22 | * This program is distributed in the hope that it will be useful, | ||
688 | 23 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
689 | 24 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
690 | 25 | * GNU General Public License for more details. | ||
691 | 26 | * | ||
692 | 27 | * You should have received a copy of the GNU General Public License | ||
693 | 28 | * along with this program; if not, write to the Free Software | ||
694 | 29 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
695 | 30 | */ | ||
696 | 31 | |||
697 | 32 | #include "private.h" | ||
698 | 33 | |||
699 | 34 | const float BlindsAnim::kDurationFactor = 1.43; | ||
700 | 35 | |||
701 | 36 | |||
702 | 37 | BlindsAnim::BlindsAnim (CompWindow *w, | ||
703 | 38 | WindowEvent curWindowEvent, | ||
704 | 39 | float duration, | ||
705 | 40 | const AnimEffect info, | ||
706 | 41 | const CompRect &icon) : | ||
707 | 42 | Animation::Animation (w, curWindowEvent, kDurationFactor * duration, info, icon), | ||
708 | 43 | PolygonAnim::PolygonAnim (w, curWindowEvent, kDurationFactor * duration, info, icon) | ||
709 | 44 | { | ||
710 | 45 | mAllFadeDuration = 0.3f; | ||
711 | 46 | mDoDepthTest = true; | ||
712 | 47 | mDoLighting = true; | ||
713 | 48 | mCorrectPerspective = CorrectPerspectivePolygon; | ||
714 | 49 | mBackAndSidesFadeDur = 0.2f; | ||
715 | 50 | } | ||
716 | 51 | |||
717 | 52 | void | ||
718 | 53 | BlindsAnim::init () | ||
719 | 54 | { | ||
720 | 55 | ANIMPLUS_SCREEN (screen); | ||
721 | 56 | |||
722 | 57 | tessellateIntoRectangles (as->optionGetBlindsGridx (), 1, | ||
723 | 58 | as->optionGetBlindsThickness ()); | ||
724 | 59 | |||
725 | 60 | foreach (PolygonObject *p, mPolygons) | ||
726 | 61 | { | ||
727 | 62 | //rotate around y axis | ||
728 | 63 | p->rotAxis.set (0, 1, 0); | ||
729 | 64 | p->finalRelPos.set (0, 0, 0); | ||
730 | 65 | |||
731 | 66 | int numberOfHalfTwists = as->optionGetBlindsNumHalftwists (); | ||
732 | 67 | p->finalRotAng = 180 * numberOfHalfTwists ; | ||
733 | 68 | } | ||
734 | 69 | } | ||
735 | 70 | |||
736 | 0 | 71 | ||
737 | === added file 'plugins/animationplus/src/bonanza.cpp' | |||
738 | --- plugins/animationplus/src/bonanza.cpp 1970-01-01 00:00:00 +0000 | |||
739 | +++ plugins/animationplus/src/bonanza.cpp 2016-07-25 17:11:00 +0000 | |||
740 | @@ -0,0 +1,241 @@ | |||
741 | 1 | /* | ||
742 | 2 | * Animation plugin for compiz/beryl | ||
743 | 3 | * | ||
744 | 4 | * bonanza.c | ||
745 | 5 | * | ||
746 | 6 | * Copyright : (C) 2008 Kevin DuBois | ||
747 | 7 | * E-mail : kdub423@gmail.com | ||
748 | 8 | * | ||
749 | 9 | * Based on animations system by: (C) 2006 Erkin Bahceci | ||
750 | 10 | * E-mail : erkinbah@gmail.com | ||
751 | 11 | * | ||
752 | 12 | * Based on particle system added by : (C) 2006 Dennis Kasprzyk | ||
753 | 13 | * E-mail : onestone@beryl-project.org | ||
754 | 14 | * | ||
755 | 15 | * This program is free software; you can redistribute it and/or | ||
756 | 16 | * modify it under the terms of the GNU General Public License | ||
757 | 17 | * as published by the Free Software Foundation; either version 2 | ||
758 | 18 | * of the License, or (at your option) any later version. | ||
759 | 19 | * | ||
760 | 20 | * This program is distributed in the hope that it will be useful, | ||
761 | 21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
762 | 22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
763 | 23 | * GNU General Public License for more details. | ||
764 | 24 | * | ||
765 | 25 | * You should have received a copy of the GNU General Public License | ||
766 | 26 | * along with this program; if not, write to the Free Software | ||
767 | 27 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
768 | 28 | */ | ||
769 | 29 | |||
770 | 30 | #include "private.h" | ||
771 | 31 | #include "animation_tex.h" | ||
772 | 32 | |||
773 | 33 | // ===================== Effect: Burn ========================= | ||
774 | 34 | |||
775 | 35 | BonanzaAnim::BonanzaAnim (CompWindow *w, | ||
776 | 36 | WindowEvent curWindowEvent, | ||
777 | 37 | float duration, | ||
778 | 38 | const AnimEffect info, | ||
779 | 39 | const CompRect &icon) : | ||
780 | 40 | Animation::Animation (w, curWindowEvent, duration, info, icon), | ||
781 | 41 | ParticleAnim::ParticleAnim (w, curWindowEvent, duration, info, icon) | ||
782 | 42 | { | ||
783 | 43 | ANIMPLUS_SCREEN (screen); | ||
784 | 44 | |||
785 | 45 | // Light Particles are for extras, dark particles unused? | ||
786 | 46 | initLightDarkParticles (as->optionGetBonanzaParticles (), | ||
787 | 47 | as->optionGetBonanzaParticles () / 10, | ||
788 | 48 | 0.125, | ||
789 | 49 | 0.5); | ||
790 | 50 | |||
791 | 51 | mAnimFireDirection = 0; | ||
792 | 52 | } | ||
793 | 53 | |||
794 | 54 | void | ||
795 | 55 | BonanzaAnim::genFire (int x, | ||
796 | 56 | int y, | ||
797 | 57 | int radius, | ||
798 | 58 | float size, | ||
799 | 59 | float time) | ||
800 | 60 | { | ||
801 | 61 | ANIMPLUS_SCREEN (screen); | ||
802 | 62 | |||
803 | 63 | ParticleSystem &ps = mParticleSystems[0]; | ||
804 | 64 | |||
805 | 65 | float fireLife = as->optionGetBonanzaLife (); | ||
806 | 66 | float fireLifeNeg = 1 - fireLife; | ||
807 | 67 | float fadeExtra = 0.2f * (1.01 - fireLife); | ||
808 | 68 | float max_new = ps.particles ().size () * (time / 50) * (1.05 - fireLife); | ||
809 | 69 | float numParticles = ps.particles ().size (); | ||
810 | 70 | |||
811 | 71 | unsigned short *c = as->optionGetBonanzaColor (); | ||
812 | 72 | float colr1 = (float)c[0] / 0xffff; | ||
813 | 73 | float colg1 = (float)c[1] / 0xffff; | ||
814 | 74 | float colb1 = (float)c[2] / 0xffff; | ||
815 | 75 | float colr2 = 1 / 1.7 * (float)c[0] / 0xffff; | ||
816 | 76 | float colg2 = 1 / 1.7 * (float)c[1] / 0xffff; | ||
817 | 77 | float colb2 = 1 / 1.7 * (float)c[2] / 0xffff; | ||
818 | 78 | float cola = (float)c[3] / 0xffff; | ||
819 | 79 | float rVal; | ||
820 | 80 | |||
821 | 81 | Particle *part = &(ps.particles ()[0]); | ||
822 | 82 | |||
823 | 83 | float deg = 0; | ||
824 | 84 | float inc = 2.0 * 3.1415 / numParticles; | ||
825 | 85 | float partw = 5.00; | ||
826 | 86 | float parth = partw * 1.5; | ||
827 | 87 | bool mysticalFire = as->optionGetBonanzaMystical (); | ||
828 | 88 | |||
829 | 89 | for (unsigned int i = 0; i < numParticles && max_new > 0; i++, part++) | ||
830 | 90 | { | ||
831 | 91 | deg += inc; | ||
832 | 92 | |||
833 | 93 | if (part->life <= 0.0f) | ||
834 | 94 | { | ||
835 | 95 | // give gt new life | ||
836 | 96 | rVal = (float)(random() & 0xff) / 255.0; | ||
837 | 97 | part->life = 1.0f; | ||
838 | 98 | part->fade = rVal * fireLifeNeg + fadeExtra; // Random Fade Value | ||
839 | 99 | |||
840 | 100 | // set size | ||
841 | 101 | part->width = partw; | ||
842 | 102 | part->height = parth; | ||
843 | 103 | rVal = (float)(random() & 0xff) / 255.0; | ||
844 | 104 | part->w_mod = part->h_mod = size * rVal; | ||
845 | 105 | |||
846 | 106 | part->x = (float)x + (float) radius * cosf(deg); | ||
847 | 107 | part->y = (float)y + (float) radius * sinf(deg); | ||
848 | 108 | |||
849 | 109 | //clip | ||
850 | 110 | if (part->x <= 0) | ||
851 | 111 | part->x = 0; | ||
852 | 112 | if (part->x >= 2 * x) | ||
853 | 113 | part->x = 2*x; | ||
854 | 114 | |||
855 | 115 | if (part->y <= 0) | ||
856 | 116 | part->y = 0; | ||
857 | 117 | if (part->y >= 2 * y) | ||
858 | 118 | part->y = 2*y; | ||
859 | 119 | |||
860 | 120 | part->z = 0.0; | ||
861 | 121 | |||
862 | 122 | part->xo = part->x; | ||
863 | 123 | part->yo = part->y; | ||
864 | 124 | part->zo = 0.0f; | ||
865 | 125 | |||
866 | 126 | // set speed and direction | ||
867 | 127 | rVal = (float)(random() & 0xff) / 255.0; | ||
868 | 128 | part->xi = ((rVal * 20.0) - 10.0f); | ||
869 | 129 | rVal = (float)(random() & 0xff) / 255.0; | ||
870 | 130 | part->yi = ((rVal * 20.0) - 15.0f); | ||
871 | 131 | part->zi = 0.0f; | ||
872 | 132 | |||
873 | 133 | if (mysticalFire) | ||
874 | 134 | { | ||
875 | 135 | // Random colors! (aka Mystical Fire) | ||
876 | 136 | rVal = (float)(random() & 0xff) / 255.0; | ||
877 | 137 | part->r = rVal; | ||
878 | 138 | rVal = (float)(random() & 0xff) / 255.0; | ||
879 | 139 | part->g = rVal; | ||
880 | 140 | rVal = (float)(random() & 0xff) / 255.0; | ||
881 | 141 | part->b = rVal; | ||
882 | 142 | } | ||
883 | 143 | else | ||
884 | 144 | { | ||
885 | 145 | rVal = (float)(random() & 0xff) / 255.0; | ||
886 | 146 | part->r = colr1 - rVal * colr2; | ||
887 | 147 | part->g = colg1 - rVal * colg2; | ||
888 | 148 | part->b = colb1 - rVal * colb2; | ||
889 | 149 | } | ||
890 | 150 | // set transparancy | ||
891 | 151 | part->a = cola; | ||
892 | 152 | |||
893 | 153 | // set gravity | ||
894 | 154 | part->xg = (part->x < part->xo) ? 1.0 : -1.0; | ||
895 | 155 | part->yg = -3.0f; | ||
896 | 156 | part->zg = 0.0f; | ||
897 | 157 | |||
898 | 158 | ps.activate (); | ||
899 | 159 | max_new -= 1; | ||
900 | 160 | } | ||
901 | 161 | else | ||
902 | 162 | { | ||
903 | 163 | part->xg = (part->x < part->xo) ? 1.0 : -1.0; | ||
904 | 164 | } | ||
905 | 165 | |||
906 | 166 | } | ||
907 | 167 | |||
908 | 168 | } | ||
909 | 169 | |||
910 | 170 | void | ||
911 | 171 | BonanzaAnim::step (float time) | ||
912 | 172 | { | ||
913 | 173 | float timestep = 2.0; | ||
914 | 174 | CompRect rect = mWindow->outputRect (); | ||
915 | 175 | |||
916 | 176 | mRemainingTime -= timestep; | ||
917 | 177 | if (mRemainingTime <= 0) | ||
918 | 178 | mRemainingTime = 0; // avoid sub-zero values | ||
919 | 179 | float new_f = 1 - (mRemainingTime) / (mTotalTime - timestep); | ||
920 | 180 | |||
921 | 181 | if (mCurWindowEvent == WindowEventOpen || | ||
922 | 182 | mCurWindowEvent == WindowEventUnminimize || | ||
923 | 183 | mCurWindowEvent == WindowEventUnshade) | ||
924 | 184 | { | ||
925 | 185 | new_f = 1 - new_f; | ||
926 | 186 | } | ||
927 | 187 | |||
928 | 188 | mUseDrawRegion = true; | ||
929 | 189 | mDrawRegion = CompRegion (); | ||
930 | 190 | |||
931 | 191 | |||
932 | 192 | /* define an expanding circle as a union of rectangular X regions. */ | ||
933 | 193 | float radius = 0; | ||
934 | 194 | if (mRemainingTime > 0) | ||
935 | 195 | { | ||
936 | 196 | XPoint pts[20]; | ||
937 | 197 | |||
938 | 198 | int i; | ||
939 | 199 | float two_pi = 3.14159 * 2.0; | ||
940 | 200 | int centerX = rect.centerX () + rect.x (); | ||
941 | 201 | int centerY = rect.centerY () + rect.y (); | ||
942 | 202 | float corner_dist = sqrt( powf(rect.centerX ()/2,2) + powf(rect.centerY (),2)); | ||
943 | 203 | radius = new_f * corner_dist; | ||
944 | 204 | for (i = 0; i < 20; i++) | ||
945 | 205 | { | ||
946 | 206 | pts[i].x = centerX + (int)(radius * cosf( (float) i/20.0 * two_pi )); | ||
947 | 207 | pts[i].y = centerY + (int)(radius * sinf( (float) i/20.0 * two_pi )); | ||
948 | 208 | } | ||
949 | 209 | |||
950 | 210 | Region pointsRegion = XPolygonRegion (&pts[0], 20, WindingRule);; | ||
951 | 211 | mDrawRegion = CompRegionRef(pointsRegion) - emptyRegion.united (rect); | ||
952 | 212 | XDestroyRegion (pointsRegion); | ||
953 | 213 | } | ||
954 | 214 | else | ||
955 | 215 | { | ||
956 | 216 | mDrawRegion = emptyRegion; | ||
957 | 217 | } | ||
958 | 218 | |||
959 | 219 | |||
960 | 220 | mUseDrawRegion = (fabs (new_f) > 1e-5); | ||
961 | 221 | |||
962 | 222 | genFire (rect.centerX (), | ||
963 | 223 | rect.centerY (), | ||
964 | 224 | radius, | ||
965 | 225 | WIN_W(mWindow) / 40.0, | ||
966 | 226 | time); | ||
967 | 227 | |||
968 | 228 | if (mRemainingTime <= 0 && mParticleSystems.size () && mParticleSystems.at (0).active ()) | ||
969 | 229 | { | ||
970 | 230 | mRemainingTime = 0; | ||
971 | 231 | } | ||
972 | 232 | |||
973 | 233 | if (mParticleSystems.empty () || !mParticleSystems.at (0).active ()) | ||
974 | 234 | { | ||
975 | 235 | mParticleSystems.clear (); | ||
976 | 236 | // Abort animation | ||
977 | 237 | compLogMessage ("animationaddon", CompLogLevelError, "Couldn't do bonanza animation\n"); | ||
978 | 238 | mRemainingTime = 0; | ||
979 | 239 | } | ||
980 | 240 | } | ||
981 | 241 | |||
982 | 0 | 242 | ||
983 | === added file 'plugins/animationplus/src/helix.cpp' | |||
984 | --- plugins/animationplus/src/helix.cpp 1970-01-01 00:00:00 +0000 | |||
985 | +++ plugins/animationplus/src/helix.cpp 2016-07-25 17:11:00 +0000 | |||
986 | @@ -0,0 +1,93 @@ | |||
987 | 1 | /* | ||
988 | 2 | * Animation plugin for compiz/beryl | ||
989 | 3 | * | ||
990 | 4 | * animation.c | ||
991 | 5 | * | ||
992 | 6 | * Copyright : (C) 2008 Kevin DuBois | ||
993 | 7 | * E-mail : kdub432@gmail.com | ||
994 | 8 | * | ||
995 | 9 | * Based on other animations by | ||
996 | 10 | * : Erkin Bahceci | ||
997 | 11 | * E-mail : erkinbah@gmail.com | ||
998 | 12 | * | ||
999 | 13 | * Which were based on Wobbly and Minimize plugins by | ||
1000 | 14 | * : David Reveman | ||
1001 | 15 | * E-mail : davidr@novell.com> | ||
1002 | 16 | * | ||
1003 | 17 | * This program is free software; you can redistribute it and/or | ||
1004 | 18 | * modify it under the terms of the GNU General Public License | ||
1005 | 19 | * as published by the Free Software Foundation; either version 2 | ||
1006 | 20 | * of the License, or (at your option) any later version. | ||
1007 | 21 | * | ||
1008 | 22 | * This program is distributed in the hope that it will be useful, | ||
1009 | 23 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1010 | 24 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1011 | 25 | * GNU General Public License for more details. | ||
1012 | 26 | * | ||
1013 | 27 | * You should have received a copy of the GNU General Public License | ||
1014 | 28 | * along with this program; if not, write to the Free Software | ||
1015 | 29 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
1016 | 30 | */ | ||
1017 | 31 | |||
1018 | 32 | #include "private.h" | ||
1019 | 33 | |||
1020 | 34 | const float HelixAnim::kDurationFactor = 1.43; | ||
1021 | 35 | |||
1022 | 36 | HelixAnim::HelixAnim (CompWindow *w, | ||
1023 | 37 | WindowEvent curWindowEvent, | ||
1024 | 38 | float duration, | ||
1025 | 39 | const AnimEffect info, | ||
1026 | 40 | const CompRect &icon) : | ||
1027 | 41 | Animation::Animation (w, curWindowEvent, kDurationFactor * duration, info, icon), | ||
1028 | 42 | PolygonAnim::PolygonAnim (w, curWindowEvent, kDurationFactor * duration, info, icon) | ||
1029 | 43 | { | ||
1030 | 44 | mAllFadeDuration = 0.4f; | ||
1031 | 45 | mBackAndSidesFadeDur = 0.2f; | ||
1032 | 46 | mDoDepthTest = TRUE; | ||
1033 | 47 | mDoLighting = TRUE; | ||
1034 | 48 | mCorrectPerspective = CorrectPerspectivePolygon; | ||
1035 | 49 | } | ||
1036 | 50 | |||
1037 | 51 | void | ||
1038 | 52 | HelixAnim::init () | ||
1039 | 53 | { | ||
1040 | 54 | ANIMPLUS_SCREEN (screen); | ||
1041 | 55 | |||
1042 | 56 | int gridsizeY = as->optionGetHelixGridy (); | ||
1043 | 57 | int count = 0; | ||
1044 | 58 | |||
1045 | 59 | tessellateIntoRectangles (1, gridsizeY, as->optionGetHelixThickness ()); | ||
1046 | 60 | |||
1047 | 61 | foreach (PolygonObject *p, mPolygons) | ||
1048 | 62 | { | ||
1049 | 63 | |||
1050 | 64 | //rotate around y axis normally, or the z axis if the effect is in vertical mode | ||
1051 | 65 | if (as->optionGetHelixDirection ()) | ||
1052 | 66 | p->rotAxis.set (0, 0, 1); | ||
1053 | 67 | else | ||
1054 | 68 | p->rotAxis.set (0, 1, 0); | ||
1055 | 69 | |||
1056 | 70 | //only move the pieces in a 'vertical' rotation | ||
1057 | 71 | if (as->optionGetHelixDirection ()) | ||
1058 | 72 | p->finalRelPos.set (0, | ||
1059 | 73 | -1 * ((mWindow->height () / gridsizeY) * (count - gridsizeY/2)), | ||
1060 | 74 | 0); | ||
1061 | 75 | else | ||
1062 | 76 | p->finalRelPos.set (0, | ||
1063 | 77 | 0, | ||
1064 | 78 | 0); | ||
1065 | 79 | |||
1066 | 80 | //determine how long, and what direction to spin | ||
1067 | 81 | int numberOfTwists = as->optionGetHelixNumTwists (); | ||
1068 | 82 | int spin_dir = as->optionGetHelixSpinDirection (); | ||
1069 | 83 | |||
1070 | 84 | if (spin_dir) | ||
1071 | 85 | p->finalRotAng = 270 - ( 2 * numberOfTwists * count); | ||
1072 | 86 | else | ||
1073 | 87 | p->finalRotAng = ( 2 * numberOfTwists * count) - 270; | ||
1074 | 88 | |||
1075 | 89 | count++; | ||
1076 | 90 | |||
1077 | 91 | } | ||
1078 | 92 | } | ||
1079 | 93 | |||
1080 | 0 | 94 | ||
1081 | === added file 'plugins/animationplus/src/private.h' | |||
1082 | --- plugins/animationplus/src/private.h 1970-01-01 00:00:00 +0000 | |||
1083 | +++ plugins/animationplus/src/private.h 2016-07-25 17:11:00 +0000 | |||
1084 | @@ -0,0 +1,196 @@ | |||
1085 | 1 | #include <string.h> | ||
1086 | 2 | #include <stdlib.h> | ||
1087 | 3 | #include <math.h> | ||
1088 | 4 | #include <sys/time.h> | ||
1089 | 5 | |||
1090 | 6 | #ifdef USE_LIBRSVG | ||
1091 | 7 | #include <cairo/cairo.h> | ||
1092 | 8 | #include <cairo/cairo-xlib.h> | ||
1093 | 9 | #include <librsvg/rsvg.h> | ||
1094 | 10 | #include <librsvg/rsvg-cairo.h> | ||
1095 | 11 | #endif | ||
1096 | 12 | |||
1097 | 13 | #include <core/core.h> | ||
1098 | 14 | #include <opengl/opengl.h> | ||
1099 | 15 | #include <composite/composite.h> | ||
1100 | 16 | #include <animation/animation.h> | ||
1101 | 17 | #include <animationaddon/animationaddon.h> | ||
1102 | 18 | |||
1103 | 19 | #include "animationplus_options.h" | ||
1104 | 20 | |||
1105 | 21 | extern AnimEffect AnimEffectBlinds; | ||
1106 | 22 | extern AnimEffect AnimEffectBonanza; | ||
1107 | 23 | extern AnimEffect AnimEffectHelix; | ||
1108 | 24 | extern AnimEffect AnimEffectShatter; | ||
1109 | 25 | |||
1110 | 26 | #define NUM_EFFECTS 4 | ||
1111 | 27 | |||
1112 | 28 | // This must have the value of the first "effect setting" above | ||
1113 | 29 | // in AnimEgScreenOptions | ||
1114 | 30 | #define NUM_NONEFFECT_OPTIONS 0 | ||
1115 | 31 | |||
1116 | 32 | #define WIN_X(w) ((w)->x () - (w)->input ().left) | ||
1117 | 33 | #define WIN_Y(w) ((w)->y () - (w)->input ().top) | ||
1118 | 34 | #define WIN_W(w) ((w)->width () + (w)->input ().left + (w)->input ().right) | ||
1119 | 35 | #define WIN_H(w) ((w)->height () + (w)->input ().top + (w)->input ().bottom) | ||
1120 | 36 | |||
1121 | 37 | class ExtensionPluginAnimPlus : public ExtensionPluginInfo | ||
1122 | 38 | { | ||
1123 | 39 | public: | ||
1124 | 40 | |||
1125 | 41 | ExtensionPluginAnimPlus (const CompString &name, | ||
1126 | 42 | unsigned int nEffects, | ||
1127 | 43 | AnimEffect *effects, | ||
1128 | 44 | CompOption::Vector *effectOptions, | ||
1129 | 45 | unsigned int firstEffectOptionIndex) : | ||
1130 | 46 | ExtensionPluginInfo (name, nEffects, effects, effectOptions, | ||
1131 | 47 | firstEffectOptionIndex) {} | ||
1132 | 48 | ~ExtensionPluginAnimPlus () {} | ||
1133 | 49 | |||
1134 | 50 | const CompOutput *output () { return mOutput; } | ||
1135 | 51 | private: | ||
1136 | 52 | |||
1137 | 53 | const CompOutput *mOutput; | ||
1138 | 54 | }; | ||
1139 | 55 | |||
1140 | 56 | class BasePlusAnim : | ||
1141 | 57 | virtual public Animation | ||
1142 | 58 | { | ||
1143 | 59 | public: | ||
1144 | 60 | |||
1145 | 61 | BasePlusAnim (CompWindow *w, | ||
1146 | 62 | WindowEvent curWindowEvent, | ||
1147 | 63 | float duration, | ||
1148 | 64 | const AnimEffect info, | ||
1149 | 65 | const CompRect &icon); | ||
1150 | 66 | |||
1151 | 67 | ~BasePlusAnim () {} | ||
1152 | 68 | |||
1153 | 69 | protected: | ||
1154 | 70 | // Gets info about the extension plugin that implements this animation. | ||
1155 | 71 | ExtensionPluginInfo* getExtensionPluginInfo (); | ||
1156 | 72 | |||
1157 | 73 | CompositeScreen *mCScreen; | ||
1158 | 74 | GLScreen *mGScreen; | ||
1159 | 75 | }; | ||
1160 | 76 | |||
1161 | 77 | class AnimPlusScreen : | ||
1162 | 78 | public PluginClassHandler <AnimPlusScreen, CompScreen>, | ||
1163 | 79 | public AnimationplusOptions | ||
1164 | 80 | { | ||
1165 | 81 | public: | ||
1166 | 82 | |||
1167 | 83 | AnimPlusScreen (CompScreen *); | ||
1168 | 84 | ~AnimPlusScreen (); | ||
1169 | 85 | |||
1170 | 86 | protected: | ||
1171 | 87 | |||
1172 | 88 | void initAnimationList (); | ||
1173 | 89 | |||
1174 | 90 | CompOutput &mOutput; | ||
1175 | 91 | }; | ||
1176 | 92 | |||
1177 | 93 | class AnimPlusWindow : | ||
1178 | 94 | public PluginClassHandler <AnimPlusWindow, CompWindow> | ||
1179 | 95 | { | ||
1180 | 96 | public: | ||
1181 | 97 | |||
1182 | 98 | AnimPlusWindow (CompWindow *); | ||
1183 | 99 | ~AnimPlusWindow (); | ||
1184 | 100 | |||
1185 | 101 | protected: | ||
1186 | 102 | |||
1187 | 103 | CompWindow *mWindow; | ||
1188 | 104 | AnimWindow *aWindow; | ||
1189 | 105 | |||
1190 | 106 | }; | ||
1191 | 107 | |||
1192 | 108 | #define ANIMPLUS_SCREEN(s) \ | ||
1193 | 109 | AnimPlusScreen *as = AnimPlusScreen::get (s); | ||
1194 | 110 | |||
1195 | 111 | #define ANIMPLUS_WINDOW(w) \ | ||
1196 | 112 | AnimPlusWindow *aw = AnimPlusWindow::get (w); | ||
1197 | 113 | |||
1198 | 114 | // ratio of perceived length of animation compared to real duration | ||
1199 | 115 | // to make it appear to have the same speed with other animation effects | ||
1200 | 116 | |||
1201 | 117 | #define EXPLODE_PERCEIVED_T 0.7f | ||
1202 | 118 | |||
1203 | 119 | /* | ||
1204 | 120 | * Function prototypes | ||
1205 | 121 | * | ||
1206 | 122 | */ | ||
1207 | 123 | |||
1208 | 124 | class BlindsAnim : public PolygonAnim | ||
1209 | 125 | { | ||
1210 | 126 | public: | ||
1211 | 127 | |||
1212 | 128 | BlindsAnim (CompWindow *w, | ||
1213 | 129 | WindowEvent curWindowEvent, | ||
1214 | 130 | float duration, | ||
1215 | 131 | const AnimEffect info, | ||
1216 | 132 | const CompRect &icon); | ||
1217 | 133 | |||
1218 | 134 | void init (); | ||
1219 | 135 | protected: | ||
1220 | 136 | static const float kDurationFactor; | ||
1221 | 137 | }; | ||
1222 | 138 | |||
1223 | 139 | class HelixAnim : public PolygonAnim | ||
1224 | 140 | { | ||
1225 | 141 | public: | ||
1226 | 142 | HelixAnim (CompWindow *w, | ||
1227 | 143 | WindowEvent curWindowEvent, | ||
1228 | 144 | float duration, | ||
1229 | 145 | const AnimEffect info, | ||
1230 | 146 | const CompRect &icon); | ||
1231 | 147 | |||
1232 | 148 | void init (); | ||
1233 | 149 | protected: | ||
1234 | 150 | static const float kDurationFactor; | ||
1235 | 151 | }; | ||
1236 | 152 | |||
1237 | 153 | class BonanzaAnim : public ParticleAnim | ||
1238 | 154 | { | ||
1239 | 155 | public: | ||
1240 | 156 | BonanzaAnim (CompWindow *w, | ||
1241 | 157 | WindowEvent curWindowEvent, | ||
1242 | 158 | float duration, | ||
1243 | 159 | const AnimEffect info, | ||
1244 | 160 | const CompRect &icon); | ||
1245 | 161 | |||
1246 | 162 | void | ||
1247 | 163 | genFire (int x, | ||
1248 | 164 | int y, | ||
1249 | 165 | int radius, | ||
1250 | 166 | float size, | ||
1251 | 167 | float time); | ||
1252 | 168 | |||
1253 | 169 | void step (float); | ||
1254 | 170 | protected: | ||
1255 | 171 | |||
1256 | 172 | int mAnimFireDirection; | ||
1257 | 173 | unsigned int mFirePDId; | ||
1258 | 174 | }; | ||
1259 | 175 | |||
1260 | 176 | class ShatterAnim : public PolygonAnim | ||
1261 | 177 | { | ||
1262 | 178 | public: | ||
1263 | 179 | ShatterAnim (CompWindow *w, | ||
1264 | 180 | WindowEvent curWindowEvent, | ||
1265 | 181 | float duration, | ||
1266 | 182 | const AnimEffect info, | ||
1267 | 183 | const CompRect &icon); | ||
1268 | 184 | |||
1269 | 185 | void init (); | ||
1270 | 186 | protected: | ||
1271 | 187 | static const float kDurationFactor; | ||
1272 | 188 | }; | ||
1273 | 189 | |||
1274 | 190 | class AnimPlusPluginVTable : | ||
1275 | 191 | public CompPlugin::VTableForScreenAndWindow <AnimPlusScreen, AnimPlusWindow> | ||
1276 | 192 | { | ||
1277 | 193 | public: | ||
1278 | 194 | |||
1279 | 195 | bool init (); | ||
1280 | 196 | }; | ||
1281 | 0 | 197 | ||
1282 | === added file 'plugins/animationplus/src/shatter.cpp' | |||
1283 | --- plugins/animationplus/src/shatter.cpp 1970-01-01 00:00:00 +0000 | |||
1284 | +++ plugins/animationplus/src/shatter.cpp 2016-07-25 17:11:00 +0000 | |||
1285 | @@ -0,0 +1,75 @@ | |||
1286 | 1 | /* | ||
1287 | 2 | * Animation plugin for compiz/beryl | ||
1288 | 3 | * | ||
1289 | 4 | * animation.c | ||
1290 | 5 | * | ||
1291 | 6 | * Copyright : (C) 2008 Kevin DuBois | ||
1292 | 7 | * E-mail : kdub432@gmail.com | ||
1293 | 8 | * | ||
1294 | 9 | * Based on other animations by | ||
1295 | 10 | * : Erkin Bahceci | ||
1296 | 11 | * E-mail : erkinbah@gmail.com | ||
1297 | 12 | * | ||
1298 | 13 | * Which were based on Wobbly and Minimize plugins by | ||
1299 | 14 | * : David Reveman | ||
1300 | 15 | * E-mail : davidr@novell.com> | ||
1301 | 16 | * | ||
1302 | 17 | * This program is free software; you can redistribute it and/or | ||
1303 | 18 | * modify it under the terms of the GNU General Public License | ||
1304 | 19 | * as published by the Free Software Foundation; either version 2 | ||
1305 | 20 | * of the License, or (at your option) any later version. | ||
1306 | 21 | * | ||
1307 | 22 | * This program is distributed in the hope that it will be useful, | ||
1308 | 23 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1309 | 24 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1310 | 25 | * GNU General Public License for more details. | ||
1311 | 26 | * | ||
1312 | 27 | * You should have received a copy of the GNU General Public License | ||
1313 | 28 | * along with this program; if not, write to the Free Software | ||
1314 | 29 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
1315 | 30 | */ | ||
1316 | 31 | #include "private.h" | ||
1317 | 32 | |||
1318 | 33 | const float ShatterAnim::kDurationFactor = 1.43; | ||
1319 | 34 | |||
1320 | 35 | ShatterAnim::ShatterAnim (CompWindow *w, | ||
1321 | 36 | WindowEvent curWindowEvent, | ||
1322 | 37 | float duration, | ||
1323 | 38 | const AnimEffect info, | ||
1324 | 39 | const CompRect &icon) : | ||
1325 | 40 | Animation::Animation (w, curWindowEvent, kDurationFactor * duration, info, | ||
1326 | 41 | icon), | ||
1327 | 42 | PolygonAnim::PolygonAnim (w, curWindowEvent, kDurationFactor * duration, | ||
1328 | 43 | info, icon) | ||
1329 | 44 | { | ||
1330 | 45 | mAllFadeDuration = 0.4f; | ||
1331 | 46 | mBackAndSidesFadeDur = 0.2f; | ||
1332 | 47 | mDoDepthTest = true; | ||
1333 | 48 | mDoLighting = true; | ||
1334 | 49 | mCorrectPerspective = CorrectPerspectivePolygon; | ||
1335 | 50 | } | ||
1336 | 51 | |||
1337 | 52 | void | ||
1338 | 53 | ShatterAnim::init () | ||
1339 | 54 | { | ||
1340 | 55 | ANIMPLUS_SCREEN (screen); | ||
1341 | 56 | int static_polygon; | ||
1342 | 57 | int screen_height = screen->outputDevs ().at (mWindow->outputDevice ()).height (); | ||
1343 | 58 | |||
1344 | 59 | tessellateIntoGlass (as->optionGetShatterNumSpokes (), | ||
1345 | 60 | as->optionGetShatterNumTiers (), | ||
1346 | 61 | 1); //can't really see how thick it is... | ||
1347 | 62 | |||
1348 | 63 | foreach (PolygonObject *p, mPolygons) | ||
1349 | 64 | { | ||
1350 | 65 | p->rotAxis.set (0, 0, 1); | ||
1351 | 66 | static_polygon = 1; | ||
1352 | 67 | |||
1353 | 68 | p->finalRelPos.set (0, | ||
1354 | 69 | static_polygon * (-p->centerPosStart.y () + screen_height), | ||
1355 | 70 | 0); | ||
1356 | 71 | if (p->finalRelPos.y ()) | ||
1357 | 72 | p->finalRotAng = RAND_FLOAT() * 120 * ( RAND_FLOAT() < 0.5 ? -1 : 1 ); | ||
1358 | 73 | } | ||
1359 | 74 | } | ||
1360 | 75 | |||
1361 | 0 | 76 | ||
1362 | === modified file 'plugins/simple-animations/CMakeLists.txt' | |||
1363 | --- plugins/simple-animations/CMakeLists.txt 2016-07-25 17:10:49 +0000 | |||
1364 | +++ plugins/simple-animations/CMakeLists.txt 2016-07-25 17:11:00 +0000 | |||
1365 | @@ -1,8 +1,4 @@ | |||
1366 | 1 | find_package (Compiz REQUIRED) | 1 | find_package (Compiz REQUIRED) |
1367 | 2 | |||
1368 | 3 | include (FindOpenGL) | ||
1369 | 4 | include (CompizPlugin) | 2 | include (CompizPlugin) |
1370 | 5 | 3 | ||
1374 | 6 | if (OPENGL_GLU_FOUND) | 4 | compiz_plugin (animationsim PLUGINDEPS composite opengl animation) |
1372 | 7 | compiz_plugin (animationsim PLUGINDEPS composite opengl animation LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR}) | ||
1373 | 8 | endif (OPENGL_GLU_FOUND) |
Issues in generating deb packages here
dh_install --fail-missing */compiz/ *animationsplus .*" (tried in "." and "debian/tmp") */compiz/ *animationsplus .* compiz/ *animationsplus .*" (tried in "." and "debian/tmp") compiz/ *animationsplus .* x86_64- linux-gnu/ compiz/ libanimationplu s.so exists in debian/tmp but is not installed to anywhere compiz/ animationplus. xml exists in debian/tmp but is not installed to anywhere
dh_install: Cannot find (any matches for) "usr/lib/
dh_install: compiz-plugins missing files: usr/lib/
dh_install: Cannot find (any matches for) "usr/share/
dh_install: compiz-plugins missing files: usr/share/
dh_install: usr/lib/
dh_install: usr/share/