SoC2011 Automagic - Revision history

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

2013-03-21T01:47:52Z

Hide historical references to Subversion from the wiki search function

Automagic: /* Patches */

2011-04-16T21:27:48Z

‎Patches

Automagic: /* Abstract */

2011-04-11T22:43:36Z

‎Abstract

Automagic: /* Registering parsers */

2011-04-11T19:41:22Z

‎Registering parsers

Automagic: /* Modification class */

2011-04-11T19:38:01Z

‎Modification class

Automagic: /* Refactoring modificaitons parsing */

2011-04-11T19:36:58Z

‎Refactoring modificaitons parsing

Automagic: /* Patches */

2011-04-11T19:36:33Z

‎Patches

Show changes

Automagic: /* Timeline */

2011-04-10T02:55:57Z

‎Timeline

Automagic at 02:46, 10 April 2011

2011-04-10T02:46:48Z

Automagic: Simple prototype

2011-04-10T02:45:47Z

Simple prototype

@@ Line 352: / Line 352: @@
 :'''''I have played for a few hours.'''''
-.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.
 :'''''I haven't.'''''
@@ Line 404: / Line 404: @@
 .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)
-:'''''I used subversion a couple of times.'''''
+:'''''I used sub&shy;&shy;version a couple of times.'''''
 * C++ (language used for all the normal source code)
 :'''''I am really good at this language.'''''

@@ Line 515: / Line 515: @@
 =Patches=
-I am trying to refactor the modification handling code (See [[#Restructuring_the_modifications|restructuring the modifications]]). Most of the mofications are converted to the new hierarchy, but I have some trouble with the TC, RC and PAL modifications. I will provide a patch whenever I get it to work.
+* [https://gna.org/patch/index.php?2633 patch #2633] refactoring image modification parsing
 ===Refactoring modificaiton parsing===
 I have finally arrived at a seemingly working solution. It hasn't been tested yet - I have only played the game build with this change and haven't noticed any differences. I will write some unit tests to make sure it works when I get more time.

@@ Line 522: / Line 522: @@
 ====Abstract====
-While reading through image.cpp to prepare my proposal I have noticed the ugly almoat 400 line long loop in the image::locator::load_image_sub_file method. In the process of analysing it I have devised a way of refactoring it into smaller pieces. This patch is an implementation of that idea.
+While reading through image.cpp to prepare my proposal I have noticed the ugly almost 400 line long loop in the image::locator::load_image_sub_file method. In the process of analysing it I have devised a way of refactoring it into smaller pieces. This patch is an implementation of that idea.
 Essentially the image::function hierarchy is repalced with the image::modification hierarchy and the image::modification::decode(const std::string&) static method is capable of reading the image::modification objects from the modification string.

@@ Line 621: / Line 621: @@
 modification* parse_BL_mod(const std::string&);
 struct parse_BL_mod_registration
+{
@@ Line 628: / Line 629: @@
+         }
 } parse_BL_mod_registration_aux;
 modification* parse_BL_mod(const std::string& args)
@@ Line 636: / Line 638: @@
+}
 </pre>
 The structure is necessary to evaluate the ''mod_parsers["BL"] = &parse_BL_mod;'' line at global scope (i.e. without being within any function). Everything is embedded in an anonymous namespace.
 ====The modificaiton queue====

@@ Line 529: / Line 529: @@
 The modification class is almost the same as the function class it replaces. It only adds a priority virtual method for determining modification priority. Here it is:
 <pre>
-class mod_ptr_wrapper_
+class modification
+{
 public:
-	mod_ptr_wrapper_(modification* mod)
+	static modification_queue decode(const std::string&);
-	operator modification*() const
+	virtual ~modification() {}
-	bool operator<(const mod_ptr_wrapper_& mpw) const
+	virtual surface operator()(const surface& src) const = 0;
+	virtual int priority() const { return 0; }
 };
 </pre>

@@ Line 518: / Line 518: @@
 '''I will try to provide some patches soon.'''
-===Refactoring modificaitons parsing===
+===Refactoring modificaiton parsing===
 I have finally arrived at a seemingly working solution. It hasn't been tested yet - I have only played the game build with this change and haven't noticed any differences. I will write some unit tests to make sure it works when I get more time.

@@ Line 14: / Line 14: @@
 | Getting to know the codebase, reading the documentation, discussing project details with my mentor and the artists.
 |-
-| Stage 1
+| Stage 1.1
-| May 23 - June 21
+| May 23 - June 14
-| Implementing the sprite packing tool's core and the image loader. ''(Around the end of June I will have one exam and will have to defend my bachelor's thesis)''
+| Implementing the sprite packing tool's core
 |-
-| Stage 2
+| Stage 1.2
-| June 22 - July 21
+| June 15 - June 21
-| Implementing the GUI for the tool.
+| Implementing the C++ spritesheet manager.
 |-
 | Stage 3
@@ Line 28: / Line 36: @@
 | Buffer&nbsp;time
 | August&nbsp;8&nbsp;-&nbsp;August&nbsp;22
-| Writing documentation.
+| Filling gaps in the documentation.
 |}

← Older revision		Revision as of 02:45, 10 April 2011
Line 419:		Line 419:
	5.4) Would you mind talking with your mentor on telephone / internet phone? We would like to have a backup way for communications for the case that somehow emails and IRC do fail. If you are willing to do so, please do list a phone number (including international code) so that we are able to contact you. You should probably only add this number in the application for you submit to google since the info in the wiki is available in public. We will not make any use of your number unless some case of "there is no way to contact you" does arise!		5.4) Would you mind talking with your mentor on telephone / internet phone? We would like to have a backup way for communications for the case that somehow emails and IRC do fail. If you are willing to do so, please do list a phone number (including international code) so that we are able to contact you. You should probably only add this number in the application for you submit to google since the info in the wiki is available in public. We will not make any use of your number unless some case of "there is no way to contact you" does arise!
	:'''''I have no objections to talking through skype.'''''		:'''''I have no objections to talking through skype.'''''
		+
		+	=A simple prototype=
		+	I have created a simple prototype of the tool. It doesn't have much functionality, but it prooves that python is a good language to use for the task.
		+
		+	The tool reads the config file and displays a very simple GUI. When the GUI is clicked the spritesheet gets packed or unpacked. The config file's structure is the same as I intend to use in the project.
		+
		+
		+	{\| class="wikitable"
		+	\|-
		+	\| https://lh6.googleusercontent.com/_c7O0Mi2Ffsw/TaEVTjUywLI/AAAAAAAAANc/rOt5C88T2cA/prototype.png
		+	\|-
		+	\| A pair of screenshots representing the whole functionality of the script.
		+	\|}
		+
		+	Directory structure packed:
		+	<pre>
		+	$ tree
		+	.
		+	\|-- config
		+	\| `-- spritesheets.cfg
		+	\|-- images
		+	\| `-- leader-attack-spritesheet.png
		+	`-- prototype.py
		+	</pre>
		+
		+	Directory structure unpacked:
		+	<pre>
		+	$ tree
		+	.
		+	\|-- config
		+	\| `-- spritesheets.cfg
		+	\|-- images
		+	\| \|-- leader-attack-1.png
		+	\| \|-- leader-attack-2.png
		+	\| \|-- leader-attack-3.png
		+	\| \|-- leader-attack-4.png
		+	\| `-- leader-attack-5.png
		+	`-- prototype.py
		+	</pre>
		+
		+	The ''spritesheets.cfg'' file:
		+	<pre>
		+	[spritesheet]
		+	name=images/leader-attack-spritesheet.png
		+	is_packed=false
		+	[image]
		+	name=images/leader-attack-1.png
		+	x=1
		+	y=1
		+	width=72
		+	height=72
		+	[/image]
		+	[image]
		+	name=images/leader-attack-2.png
		+	x=73
		+	y=1
		+	width=72
		+	height=72
		+	[/image]
		+	[image]
		+	name=images/leader-attack-3.png
		+	x=145
		+	y=1
		+	width=72
		+	height=72
		+	[/image]
		+	[image]
		+	name=images/leader-attack-4.png
		+	x=217
		+	y=1
		+	width=72
		+	height=72
		+	[/image]
		+	[image]
		+	name=images/leader-attack-5.png
		+	x=289
		+	y=1
		+	width=72
		+	height=72
		+	[/image]
		+	[/spritesheet]
		+	</pre>
		+
		+	For displaying the GUI and loading/manipulating/saving ''png'' images the ''PyGame'' library was used.
		+	The complete source code can be viewed here: [http://pastebin.com/8QkzMGP3 tool-prototype.py]. The code isn't too clean - it was intended to work, not to be used in the future (I also don't have that much spare time at the moment to polish prototypes unfortunately).
		+
		+
		+	=Patches=
		+	I am trying to refactor the modification handling code (See [#Restructuring_the_modifications restructuring the modifications]). Most of the mofications are converted to the new hierarchy, but I have some trouble with the TC, RC and PAL modifications. I will provide a patch whenever I get it to work.
		+
		+	'''I will try to provide some patches soon.'''