seed r269 - trunk/examples/lightsoff
- From: hortont svn gnome org
- To: svn-commits-list gnome org
- Subject: seed r269 - trunk/examples/lightsoff
- Date: Sun, 16 Nov 2008 01:22:43 +0000 (UTC)
Author: hortont
Date: Sun Nov 16 01:22:43 2008
New Revision: 269
URL: http://svn.gnome.org/viewvc/seed?rev=269&view=rev
Log:
Lights Off: Save score in GConf, add stable level code, add level switch arrows.
Added:
trunk/examples/lightsoff/arrow-l.svg
trunk/examples/lightsoff/arrow-r.svg (contents, props changed)
trunk/examples/lightsoff/arrow.js
trunk/examples/lightsoff/lightsoff.schemas
Modified:
trunk/examples/lightsoff/Makefile.am
trunk/examples/lightsoff/board.js
trunk/examples/lightsoff/main.js
trunk/examples/lightsoff/score.js (contents, props changed)
Modified: trunk/examples/lightsoff/Makefile.am
==============================================================================
--- trunk/examples/lightsoff/Makefile.am (original)
+++ trunk/examples/lightsoff/Makefile.am Sun Nov 16 01:22:43 2008
@@ -20,7 +20,10 @@
led.svg \
score.js \
off.svg \
- menu.js
+ menu.js \
+ lightsoff.schemas \
+ arrow-l.svg \
+ arrow-r.svg
EXTRA_DIST = \
board.js \
light.js \
@@ -42,7 +45,14 @@
led.svg \
score.js \
off.svg \
- menu.js
-
+ menu.js \
+ lightsoff.schemas \
+ arrow-l.svg \
+ arrow-r.svg
## File created by the gnome-build tools
+schemadir = @GCONF_SCHEMA_FILE_DIR@
+schema_DATA = lightsoff.schemas
+
+install-data-local:
+ GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule $(schema_DATA)
Added: trunk/examples/lightsoff/arrow-l.svg
==============================================================================
--- (empty file)
+++ trunk/examples/lightsoff/arrow-l.svg Sun Nov 16 01:22:43 2008
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="49.999996"
+ height="49.999996"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="arrow-l.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/Users/hortont/Desktop/drawingON.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ version="1.0">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3537">
+ <stop
+ id="stop3539"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop3541"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3486">
+ <stop
+ id="stop3488"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop3492"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3444">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3446" />
+ <stop
+ id="stop3452"
+ offset="0.5"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3448" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <filter
+ inkscape:collect="always"
+ id="filter3478">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="4.3633868"
+ id="feGaussianBlur3480" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3522">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="7.7237026"
+ id="feGaussianBlur3524" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3444"
+ id="linearGradient2440"
+ gradientUnits="userSpaceOnUse"
+ x1="523.37036"
+ y1="199.07346"
+ x2="523.37036"
+ y2="491.56064" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3486"
+ id="linearGradient2442"
+ gradientUnits="userSpaceOnUse"
+ x1="523.37036"
+ y1="199.07346"
+ x2="523.37036"
+ y2="491.56064" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.700001"
+ inkscape:cx="9.615384"
+ inkscape:cy="25.041579"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="817"
+ inkscape:window-x="0"
+ inkscape:window-y="33" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-353.37656,-318.61163)">
+ <rect
+ style="fill:#1ea3f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.50078309;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2650"
+ width="49.499214"
+ height="49.499214"
+ x="353.62695"
+ y="318.86203"
+ rx="6.7573571"
+ ry="6.7573571" />
+ <path
+ style="opacity:0.58536545;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 374.7991,332.20565 L 374.7991,338.1744 L 397.64285,338.1744 L 397.64285,348.3619 L 374.7991,348.3619 L 374.7991,354.33065 L 361.33035,343.26815 L 374.7991,332.20565 z"
+ id="rect3273" />
+ <rect
+ ry="39.992893"
+ rx="39.992893"
+ y="199.07346"
+ x="234.0726"
+ height="292.48718"
+ width="289.29773"
+ id="rect3442"
+ style="opacity:0.94527366;fill:url(#linearGradient2440);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.94291234;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3478)"
+ transform="matrix(0.1669277,0,0,0.1669277,315.15745,286.31091)" />
+ <rect
+ style="opacity:0.7761194;fill:url(#linearGradient2442);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.94291234;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3522)"
+ id="rect3482"
+ width="289.29773"
+ height="292.48718"
+ x="234.0726"
+ y="199.07346"
+ rx="19.512152"
+ ry="19.72727"
+ transform="matrix(0.1669277,0,0,-8.1894579e-2,315.15745,384.66903)" />
+ </g>
+</svg>
Added: trunk/examples/lightsoff/arrow-r.svg
==============================================================================
--- (empty file)
+++ trunk/examples/lightsoff/arrow-r.svg Sun Nov 16 01:22:43 2008
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="49.999996"
+ height="49.999996"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="arrow.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/Users/hortont/Desktop/drawingON.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ version="1.0">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3537">
+ <stop
+ id="stop3539"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop3541"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3486">
+ <stop
+ id="stop3488"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop3492"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3444">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3446" />
+ <stop
+ id="stop3452"
+ offset="0.5"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3448" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <filter
+ inkscape:collect="always"
+ id="filter3478">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="4.3633868"
+ id="feGaussianBlur3480" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3522">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="7.7237026"
+ id="feGaussianBlur3524" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3555">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="2.1159682"
+ id="feGaussianBlur3557" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3444"
+ id="linearGradient2440"
+ gradientUnits="userSpaceOnUse"
+ x1="523.37036"
+ y1="199.07346"
+ x2="523.37036"
+ y2="491.56064" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3486"
+ id="linearGradient2442"
+ gradientUnits="userSpaceOnUse"
+ x1="523.37036"
+ y1="199.07346"
+ x2="523.37036"
+ y2="491.56064" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3537"
+ id="linearGradient2444"
+ gradientUnits="userSpaceOnUse"
+ x1="230.45604"
+ y1="258.33267"
+ x2="526.98688"
+ y2="258.33267" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.700001"
+ inkscape:cx="9.615384"
+ inkscape:cy="25.041579"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="817"
+ inkscape:window-x="0"
+ inkscape:window-y="33" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-353.37656,-318.61163)">
+ <rect
+ style="fill:#1ea3f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.50078309;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2650"
+ width="49.499214"
+ height="49.499214"
+ x="353.62695"
+ y="318.86203"
+ rx="6.7573571"
+ ry="6.7573571" />
+ <path
+ style="opacity:0.58536549999999998;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 384.1741,332.20565 L 384.1741,338.1744 L 361.33035,338.1744 L 361.33035,348.3619 L 384.1741,348.3619 L 384.1741,354.33065 L 397.64285,343.26815 L 384.1741,332.20565 z"
+ id="rect3273" />
+ <rect
+ ry="39.992893"
+ rx="39.992893"
+ y="199.07346"
+ x="234.0726"
+ height="292.48718"
+ width="289.29773"
+ id="rect3442"
+ style="opacity:0.94527366;fill:url(#linearGradient2440);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.94291234;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3478)"
+ transform="matrix(0.1669277,0,0,0.1669277,315.15745,286.31091)" />
+ <rect
+ style="opacity:0.7761194;fill:url(#linearGradient2442);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.94291234;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3522)"
+ id="rect3482"
+ width="289.29773"
+ height="292.48718"
+ x="234.0726"
+ y="199.07346"
+ rx="19.512152"
+ ry="19.72727"
+ transform="matrix(0.1669277,0,0,-8.1894579e-2,315.15745,384.66903)" />
+ </g>
+</svg>
Added: trunk/examples/lightsoff/arrow.js
==============================================================================
--- (empty file)
+++ trunk/examples/lightsoff/arrow.js Sun Nov 16 01:22:43 2008
@@ -0,0 +1,27 @@
+ArrowType = {
+ parent: Clutter.Group.type,
+ name: "Arrow",
+ class_init: function(klass, prototype)
+ {
+ prototype.set_arrow_flipped = function ()
+ {
+ this.flipped = 1;
+ this.remove_all();
+
+ var bkg = Clutter.Texture.new_from_file("./arrow-r.svg");
+ bkg.filter_quality = Clutter.TextureQuality.high;
+
+ this.add_actor(bkg);
+ }
+ },
+ instance_init: function(klass)
+ {
+ this.flipped = 0;
+ var bkg = Clutter.Texture.new_from_file("./arrow-l.svg");
+ bkg.filter_quality = Clutter.TextureQuality.high;
+
+ this.add_actor(bkg);
+ }};
+
+Arrow = new GType(ArrowType);
+
Modified: trunk/examples/lightsoff/board.js
==============================================================================
--- trunk/examples/lightsoff/board.js (original)
+++ trunk/examples/lightsoff/board.js Sun Nov 16 01:22:43 2008
@@ -60,7 +60,8 @@
if(light.get_parent().cleared() && !in_setup)
{
- score.increment_value(100);
+ score.animate_value(score.value+1);
+ gconf_client.set_int("/apps/lightsoff/score", score.value);
win_animation();
}
}
@@ -111,14 +112,16 @@
prototype.randomize = function ()
{
in_setup = true;
+
+ GLib.random_set_seed(score.value);
- var count = -4;
- var sym = Math.floor(3*Math.random());
+ var count = Math.log(score.value*score.value) + 1;
+ var sym = Math.floor(3*GLib.random_double());
- for (q = 0; q < count + 5; ++q)
+ for (q = 0; q < count; ++q)
{
- i = Math.round((tiles-1) * Math.random());
- j = Math.round((tiles-1) * Math.random());
+ i = Math.round((tiles-1) * GLib.random_double());
+ j = Math.round((tiles-1) * GLib.random_double());
flip_region(null, null, this.lights[i][j]);
Added: trunk/examples/lightsoff/lightsoff.schemas
==============================================================================
--- (empty file)
+++ trunk/examples/lightsoff/lightsoff.schemas Sun Nov 16 01:22:43 2008
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/apps/lightsoff/score</key>
+ <applyto>/apps/lightsoff/score</applyto>
+ <owner>lightsoff</owner>
+ <type>int</type>
+ <default>1</default>
+ <locale name="C">
+ <short>Current level.</short>
+ <long>Current level.</long>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
Modified: trunk/examples/lightsoff/main.js
==============================================================================
--- trunk/examples/lightsoff/main.js (original)
+++ trunk/examples/lightsoff/main.js Sun Nov 16 01:22:43 2008
@@ -11,13 +11,19 @@
Seed.import_namespace("Clutter");
Seed.import_namespace("GtkClutter");
Seed.import_namespace("GdkPixbuf");
+Seed.import_namespace("GConf");
+Seed.import_namespace("GLib");
GtkClutter.init(null, null);
+GConf.init(null, null);
Seed.include("score.js");
Seed.include("light.js");
Seed.include("board.js");
Seed.include("menu.js");
+Seed.include("arrow.js");
+
+var gconf_client = GConf.client_get_default();
var black = Clutter.Color._new();
Clutter.color_parse("Black", black);
@@ -30,21 +36,29 @@
stage.color = black;
menu = create_menu();
-board = new Board();
score = new Score();
+board = new Board();
rect = new Clutter.Rectangle({color:black});
+forward = new Arrow();
+back = new Arrow();
score.set_position((board_size / 2) - (score.width / 2), board_size + margin);
-
stage.set_size(board_size, board_size + score.height + margin * 3);
window.resize(stage.width, stage.height);
rect.set_position(0, board_size);
rect.set_size(stage.width, stage.height);
+back.set_position(score.x - back.width - 2*margin, score.y + (.5 * score.height) - (.5 * back.height));
+
+forward.set_arrow_flipped();
+forward.set_position(score.x + score.width, score.y + (.5 * score.height) - (.5 * forward.height));
+
stage.add_actor(board);
-stage.add_actor(rect);
+stage.add_actor(rect); // TODO: gradient at top of rect
stage.add_actor(score);
+stage.add_actor(forward);
+stage.add_actor(back);
stage.show_all();
window.add(clutter_embed);
Modified: trunk/examples/lightsoff/score.js
==============================================================================
--- trunk/examples/lightsoff/score.js (original)
+++ trunk/examples/lightsoff/score.js Sun Nov 16 01:22:43 2008
@@ -7,7 +7,7 @@
{
var current_val = this.value;
var max_val = this.value + val;
- for(var i = this.value; i <= max_val; i += 5)
+ for(var i = this.value; i <= max_val; i += 1)
{
Seed.setTimeout("score.animate_value("+i+");",5*(i - current_val) + 100);
}
@@ -84,7 +84,8 @@
this.bkg_top.set_position(1, 1);
this.add_actor(this.bkg_top);
- this.animate_value(0); Seed.print(bkg.__debug_ref_count());
+ this.animate_value(gconf_client.get_int("/apps/lightsoff/score"));
+ Seed.print(bkg.__debug_ref_count());
Seed.print(this.bkg_top.__debug_ref_count());
Seed.print(off_svg.__debug_ref_count());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
