SoC2012 Bloodycoin Particle Engine - Revision history

Esr: Hide historical references to Subversion from the wiki search function

2013-03-21T03:07:43Z

Hide historical references to Subversion from the wiki search function

Bloodycoin at 11:16, 15 April 2012

2012-04-15T11:16:34Z

Bloodycoin: beautifying links

2012-04-14T13:34:41Z

beautifying links

Bloodycoin: updating commit info

2012-04-14T13:31:55Z

updating commit info

Bloodycoin: Brackets correction

2012-04-14T04:10:00Z

Brackets correction

Bloodycoin: Integration

2012-04-14T04:08:29Z

Integration

Bloodycoin at 14:39, 9 April 2012

2012-04-09T14:39:32Z

Bloodycoin at 21:54, 8 April 2012

2012-04-08T21:54:03Z

Bloodycoin at 21:28, 8 April 2012

2012-04-08T21:28:39Z

Crab: /* IRC */

2012-04-05T11:18:09Z

‎IRC

@@ Line 135: / Line 135: @@
-.6) If you have contributed any patches to Wesnoth, please list them below. You can also list patches that have been submitted but not committed yet and patches that have not been specifically written for GSoC. If you have gained commit access to our SVN (during the evaluation period or earlier) please state so.
+.6) If you have contributed any patches to Wesnoth, please list them below. You can also list patches that have been submitted but not committed yet and patches that have not been specifically written for GSoC. If you have gained commit access to our S&shy;&shy;V&shy;&shy;N (during the evaluation period or earlier) please state so.
 [[https://gna.org/patch/?3243 patch#3243]] and [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53929 r53929]] - fixes ghosted unit animation in whiteboard, when unit graphics are larger than hex; (bug [[https://gna.org/bugs/index.php?19486 #19486]])<br>
-th of April gained svn access.<br>
+th of April gained s&shy;&shy;v&shy;&shy;n access.<br>
 [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53872 r53872]] and [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53879 r53879]] - resolves issue with bad refresh after scrolling and hex calculation under rectangle.<br>
 [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53928 r53928]] - bugfix [[https://gna.org/bugs/?19614 #19614]]
@@ Line 215: / Line 215: @@
 March -> Mid-May
-- familiarising with Wesnoth code structure and architecture used, refining engines functional requirements and technical details, forming API. Bugging (in a good way) my mentor if I get accepted. Making my own branch (in git, as I plan to use git-svn) of Wesnoth and playing with current graphic code. (Play Wesnoth :), finish most university assignments). While I still have lectures, they don't take much time.
+- familiarising with Wesnoth code structure and architecture used, refining engines functional requirements and technical details, forming API. Bugging (in a good way) my mentor if I get accepted. Making my own branch (in git, as I plan to use git-s&shy;&shy;v&shy;&shy;n) of Wesnoth and playing with current graphic code. (Play Wesnoth :), finish most university assignments). While I still have lectures, they don't take much time.
@@ Line 413: / Line 413: @@
 .1) Are you familiar with any of the following tools or languages?
-* Subversion (used for all commits)
+* Sub&shy;&shy;version (used for all commits)
-SVN - Only checkouts.
+S&shy;&shy;V&shy;&shy;N - Only checkouts.
 version control system - Yes, I mainly use mercurial for my projects (and now git).

@@ Line 255: / Line 255: @@
 Structure:<br>
 part_engine_ would have public methods:<br>
--update(float time_slice) <-- play all active animations, would be called in method like play_slice(), also allowing "on hover animations".<br>
+  Class Part_engine {
--reset() <-- reset all active effect, so, no effect is displayed.<br>
+  public:
--add_effect(const unit_t& unit, string type, bool hover_only, int turns = 1) <-- add effect to execution list and associates it with given unit (or terrain), where:<br>
+    update(float time_slice);
-* unit is reference to unit, on which this effect is active
+    reset();
-* type is a string, which maps to pre-defined structs of effect information (see below)
+    add_effect(const unit_t& unit, string type, bool hover_only, int turns = 1);
-* hover_only tells if this effect should be displayed always, or only on mouse hover
+    add_effect(const unit_t& unit,
-* turns tells how many turns should this effect be visible (only if hover_only is set to false), after every turn it is decremented, and effect is removed from list once it reaches 0. passing -1 makes effect stay for all game or until the unit dies.
+               int particle_number,
--add_effect(const unit_t& unit, int particle_number, float spread, std::vector<int> color_array, string particle_formula, int frame_number, bool hover_only, int turns = 1) <-- overloaded function, in which you can dynamically create your own effect, most likely to be used through lua code, to let users define their own effect. (see structure below for argument explanations)<br>
+               float spread,
--remove_effect(const effect& eff) <-- forcefully remove given effect from active list.
+               std::vector<int> color_array,
@@ Line 292: / Line 319: @@
 . map of string - string, where second string is expresion of how should the particles move. This would be a 'bit' more tricky, as string would need to be parsed, constructing correct expression and evaluating it every time, particle needs to be updated. (this could potentially be another GSoC project for a optimized and robust system). Another solution would be to pass string to lua code, for dynamic evaluation and getting result, but this would leave particle engine lua-code-dependant, which I do not seek.<br>
 Of course it is possible combining both implementations, though most likely only the first one will used in GSoC timespan.
 Integration to current code:<br>
@@ Line 360: / Line 388: @@
 <br>
 As for effect list, I am currently thinking of:
-* particles circling unit in force field-like manner - going from left side of unit to right side in front of unit, and going from right side to left side under unit. (Right-hand rule for magnetic field in wire with current flowing through it).
+* Particles circling unit in force field-like manner - going from left side of unit to right side in front of unit, and going from right side to left side under unit. (Right-hand rule for magnetic field in wire with current flowing through it). Simpliest formula could be: x = cos(t/T + variance_x); y = 0.3*cos(t/T + variance_x), variance - for phase difference.
 * Particles slowly rising upwards from bottom of hex.
-* Particles expanding from source in all directions in wave-like way.
+* Particles expanding from source in all directions in wave-like way. (e.g.: x += vel_x*dt; vel_x += force_x*dt; y calculations - same way as x).
-* particles contracting from circle line inscribed in hex to the center of hex
+* Particles contracting from circle line inscribed in hex to the center of hex
 Of course, list is open for suggestions.

@@ Line 67: / Line 67: @@
 *For my 2nd semester in university I have made spring simulator in C++ using SDL, unfortunately code didn't survive.
-*For my 3rd semester in university I have made little 2D game (more of raytraycer) with python and OpenGL (code:https://bitbucket.org/Bloodygp/ray/src)
+*For my 3rd semester in university I have made little 2D game (more of raytraycer) with python and OpenGL ([[https://bitbucket.org/Bloodygp/ray/src code]])
-*For my 5th semester in university I have made mock-up digital notebook using C++ and QT library (code: https://bitbucket.org/justas_tomkus/00101010/src)
+*For my 5th semester in university I have made mock-up digital notebook using C++ and QT library ([[https://bitbucket.org/justas_tomkus/00101010/src code]])
 *For my 5th semester in university I have made prototype DB system for museum exponates using Python and Django framework
-*I have participated in last 3 Global gamejam event and few local ones. In last 2 I have used Lua with Love2D framework (code: https://bitbucket.org/justas_tomkus/semiou/src)
+*I have participated in last 3 Global gamejam event and few local ones. In last 2 I have used Lua with Love2D framework ([[https://bitbucket.org/justas_tomkus/semiou/src code]])
 *For university assignment I was forced to use Java. (used with SWING library, building GUI, and with Threads)
 *I took parallel computing course (assignments in c++ with OpenMP, MPI, java with native threads, CSP, google Go)
 *Used Matlab for mathematical computations in university and Python for my own.
-*Last year I made mock-up IMGUI in C using SDL (code: https://bitbucket.org/Bloodygp/imgui_example/src)
+*Last year I made mock-up IMGUI in C using SDL ([[https://bitbucket.org/Bloodygp/imgui_example/src code]])
 As for software, I mainly use Vim and terminal. Though I have used NetBeans and Eclipse. Have some experience with Photoshop and Illustrator, Blender for 3D modelling.

@@ Line 137: / Line 137: @@
 .6) If you have contributed any patches to Wesnoth, please list them below. You can also list patches that have been submitted but not committed yet and patches that have not been specifically written for GSoC. If you have gained commit access to our SVN (during the evaluation period or earlier) please state so.
-[[https://gna.org/bugs/index.php?19486 Bug19486]] - fixes ghosted unit animation in whiteboard, when unit graphics are larger than hex;<br>
+[[https://gna.org/patch/?3243 patch#3243]] and [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53929 r53929]] - fixes ghosted unit animation in whiteboard, when unit graphics are larger than hex; (bug [[https://gna.org/bugs/index.php?19486 #19486]])<br>
 th of April gained svn access.<br>
 [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53872 r53872]] and [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53879 r53879]] - resolves issue with bad refresh after scrolling and hex calculation under rectangle.<br>

@@ Line 140: / Line 140: @@
 th of April gained svn access.<br>
 [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53872 r53872]] and [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53879 r53879]] - resolves issue with bad refresh after scrolling and hex calculation under rectangle.<br>
-[[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53928] r53928] - bugfix [[https://gna.org/bugs/?19614] #19614]
+[[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53928 r53928]] - bugfix [[https://gna.org/bugs/?19614 #19614]]

@@ Line 139: / Line 139: @@
 [[https://gna.org/bugs/index.php?19486 Bug19486]] - fixes ghosted unit animation in whiteboard, when unit graphics are larger than hex;<br>
 th of April gained svn access.<br>
-[[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53872 r53872]] and [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53879 r53879]] - resolves issue with bad refresh after scrolling and hex calculation under rectangle.
+[[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53872 r53872]] and [[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53879 r53879]] - resolves issue with bad refresh after scrolling and hex calculation under rectangle.<br>
@@ Line 250: / Line 251: @@
 A short description:<br>
-At the start of game, Particle_engine singleton (part_engine_ from now on) would be created (much like display singleton), so later on it could be called. This step is init of engine, though no resource-heavy loading should taken during it. Unit (possibly terrain structures) would be extended to accommodate pointers to ongoing effect, so it could be canceled and/or interrupted. The part_engine_ would keep a list of pointers to active effects, so to say, the part_engine_ would be responsible for all effect creation, destruction and their changing handling.
+At the start of game, Particle_engine singleton (part_engine_ from now on) would be created (much like display singleton), so later on it could be called. This step is init of engine, though no resource-heavy loading should taken during it. Unit (possibly terrain structures) would be extended to accommodate vector of pointers to ongoing effects associated with unit, so it could be canceled and/or interrupted. The part_engine_ would keep a list of pointers to active effects, so to say, the part_engine_ would be responsible for all effect creation, destruction and their changing handling.
 part_engine_ would have public methods:<br>
 -update(float time_slice) <-- play all active animations, would be called in method like play_slice(), also allowing "on hover animations".<br>
@@ Line 265: / Line 267: @@
 The mentioned string "type" would map to similar structure:<br>
-struct effect_type {
+  struct effect_type {
-     int particle_number;
+     int particle_numbe_r;
-     float spread;
+     float spread_;
-     std::vector<int> color_array;
+     std::vector<int> color_array_;
-     string particle_formula;
+     string particle_formula_;
-     int frames_number;
+     int frames_number_;
-};<br>
+    std::vector<particle> particle_list_;
 where:
-* particle_number is the number of particles to be released over frames_number
+* particle_number_ is the number of particles to be released over frames_number
-* spread is value in range 0..1 describing how concentrated or spread over hex should effect be
+* spread_ is value in range 0..1 describing how concentrated or spread over hex should effect be
-* color_array is a list of color values, how should particles change their color over one animation cycle
+* color_array_ is a list of color values, how should particles change their color over one animation cycle
-* particle_formula would be key to std::map<string, *function>  OR std::map<string, string> (see below)
+* particle_formula_ would be key to std::map<string, *function>  OR std::map<string, string> (see below)
-* frames_number - is the number of frames the animation should spawn over
+* frames_number_ - is the number of frames the animation should spawn over
-As far as I know such structure could be easily binded to lua code, exposing users to particles.<br>
+As far as I know such structure could be easily binded to lua code, exposing users to particle effects.<br>
 Currently I am assuming effect center to be center of hex cell, but I don't see problem modifying so it can by anywhere on hex.
@@ Line 286: / Line 292: @@
 . map of string - string, where second string is expresion of how should the particles move. This would be a 'bit' more tricky, as string would need to be parsed, constructing correct expression and evaluating it every time, particle needs to be updated. (this could potentially be another GSoC project for a optimized and robust system). Another solution would be to pass string to lua code, for dynamic evaluation and getting result, but this would leave particle engine lua-code-dependant, which I do not seek.<br>
 Of course it is possible combining both implementations, though most likely only the first one will used in GSoC timespan.

← Older revision		Revision as of 21:54, 8 April 2012
Line 138:		Line 138:

	[[https://gna.org/bugs/index.php?19486 Bug19486]] - fixes ghosted unit animation in whiteboard, when unit graphics are larger than hex;<br>		[[https://gna.org/bugs/index.php?19486 Bug19486]] - fixes ghosted unit animation in whiteboard, when unit graphics are larger than hex;<br>
−	8th of April gained svn access.	+	8th of April gained svn access.<br>
		+	[[http://svn.gna.org/viewcvs/wesnoth?view=revision&revision=53872 r53872]] - resolves issue with bad refresh after scrolling and hex calculation under rectangle.

← Older revision		Revision as of 21:28, 8 April 2012
Line 137:		Line 137:
	2.6) If you have contributed any patches to Wesnoth, please list them below. You can also list patches that have been submitted but not committed yet and patches that have not been specifically written for GSoC. If you have gained commit access to our SVN (during the evaluation period or earlier) please state so.		2.6) If you have contributed any patches to Wesnoth, please list them below. You can also list patches that have been submitted but not committed yet and patches that have not been specifically written for GSoC. If you have gained commit access to our SVN (during the evaluation period or earlier) please state so.

−	~~Nothing yet~~.	+	[[https://gna.org/bugs/index.php?19486 Bug19486]] - fixes ghosted unit animation in whiteboard, when unit graphics are larger than hex;<br>
		+	8th of April gained svn access.
		+

@@ Line 11: / Line 11: @@
 =IRC=
 bloodycoin, S_arms, bloodyGP
 =Questionnaire=