diff options
23 files changed, 608 insertions, 1176 deletions
diff --git a/core/range_iterator.cpp b/core/range_iterator.cpp new file mode 100644 index 0000000000..9534e011d7 --- /dev/null +++ b/core/range_iterator.cpp @@ -0,0 +1,169 @@ +/*************************************************************************/ +/* range_iterator.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ + +#include "range_iterator.h" +#include "object_type_db.h" + +void RangeIterator::_bind_methods() { + ObjectTypeDB::bind_method(_MD("_iter_init","arg"),&RangeIterator::_iter_init); + ObjectTypeDB::bind_method(_MD("_iter_next","arg"),&RangeIterator::_iter_next); + ObjectTypeDB::bind_method(_MD("_iter_get","arg"),&RangeIterator::_iter_get); + ObjectTypeDB::bind_method(_MD("is_finished"),&RangeIterator::is_finished); + ObjectTypeDB::bind_method(_MD("to_array"),&RangeIterator::to_array); + ObjectTypeDB::bind_method(_MD("set_range","arg1","arg2","arg3"),&RangeIterator::_set_range,DEFVAL(Variant()),DEFVAL(Variant())); +} + +bool RangeIterator::_iter_init(Variant arg) { + return !is_finished(); +} + +bool RangeIterator::_iter_next(Variant arg) { + current += step; + return !is_finished(); +} + +Variant RangeIterator::_iter_get(Variant arg) { + return Variant(current); +} + +bool RangeIterator::is_finished() { + if(step > 0) + { + return current >= stop; + } + else + { + return current <= stop; + } +} + +Array RangeIterator::to_array() { + if (step==0) { + ERR_EXPLAIN("step is zero!"); + ERR_FAIL_V(Array()); + } + + Array arr(true); + if (current >= stop && step > 0) { + return arr; + } + if (current <= stop && step < 0) { + return arr; + } + + //calculate how many + int count=0; + if (step > 0) { + count=((stop-current-1)/step)+1; + } else { + count=((current-stop-1)/-step)+1; + } + + arr.resize(count); + + if (step > 0) { + int idx=0; + for(int i=current;i<stop;i+=step) { + arr[idx++]=i; + } + } else { + int idx=0; + for(int i=current;i>stop;i+=step) { + arr[idx++]=i; + } + } + + return arr; +} + +void RangeIterator::set_range(int stop) { + this->current = 0; + this->stop = stop; + this->step = (stop > 0)?(1):(-1); +} + +void RangeIterator::set_range(int start, int stop) { + this->current = start; + this->stop = stop; + this->step = (stop > start)?(1):(-1); +} + +void RangeIterator::set_range(int start, int stop, int step) { + if(step == 0) + { + ERR_EXPLAIN("step is zero!"); + ERR_FAIL(); + } + + this->current = start; + this->stop = stop; + this->step = step; +} + +Ref<RangeIterator> RangeIterator::_set_range(Variant arg1, Variant arg2, Variant arg3) +{ + bool valid = true; + if(arg1.get_type() == Variant::INT) + { + if(arg2.get_type() == Variant::INT) + { + if(arg3.get_type() == Variant::INT) set_range((int)arg1, (int)arg2, (int)arg3); // (start, end, step) + else if(arg3.get_type() == Variant::NIL) set_range((int)arg1, (int)arg2); // (start, end) + else valid = false; + } + else if(arg2.get_type() == Variant::NIL) set_range((int)arg1); // (end) + else valid = false; + } + else valid = false; + + if(!valid) + { + ERR_EXPLAIN("Invalid type in function 'set_range' in base 'RangeIterator'. Expected 1, 2, or 3 ints."); + ERR_FAIL_V(Ref<RangeIterator>()); + } + return Ref<RangeIterator>(this); +} + +RangeIterator::RangeIterator() { + current = 0; + stop = 0; + step = 0; +} + +RangeIterator::RangeIterator(int stop) { + set_range(stop); +} + +RangeIterator::RangeIterator(int start, int stop) { + set_range(start, stop); +} + +RangeIterator::RangeIterator(int start, int stop, int step) { + set_range(start, stop, step); +} diff --git a/core/range_iterator.h b/core/range_iterator.h new file mode 100644 index 0000000000..c3e38a9094 --- /dev/null +++ b/core/range_iterator.h @@ -0,0 +1,72 @@ +/*************************************************************************/ +/* range_iterator.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#ifndef RANGE_ITERATOR_H +#define RANGE_ITERATOR_H + +#include "reference.h" +#include "variant.h" +#include "array.h" + +class RangeIterator : public Reference +{ +protected: + OBJ_TYPE( RangeIterator, Reference ); + + static void _bind_methods(); + +private: + int current; + int stop; + int step; + + bool _iter_init(Variant arg); + bool _iter_next(Variant arg); + Variant _iter_get(Variant arg); + +public: + + bool is_finished(); + + Array to_array(); + + void set_range(int stop); + void set_range(int start, int stop); + void set_range(int start, int stop, int step); + + Ref<RangeIterator> _set_range(Variant arg1, Variant arg2 = Variant(), Variant arg3 = Variant()); + + void _init(Variant arg1, Variant arg2, Variant arg3); + + RangeIterator(); + RangeIterator(int stop); + RangeIterator(int start, int stop); + RangeIterator(int start, int stop, int step); +}; + +#endif // RANGE_ITERATOR_H diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index 54431cf381..c516059cfb 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -52,6 +52,7 @@ #include "func_ref.h" #include "input_map.h" #include "undo_redo.h" +#include "range_iterator.h" #ifdef XML_ENABLED static ResourceFormatSaverXML *resource_saver_xml=NULL; @@ -130,6 +131,8 @@ void register_core_types() { ObjectTypeDB::register_type<Translation>(); ObjectTypeDB::register_type<PHashTranslation>(); ObjectTypeDB::register_type<UndoRedo>(); + ObjectTypeDB::register_type<RangeIterator>(); + ObjectTypeDB::register_type<HTTPClient>(); ObjectTypeDB::register_virtual_type<ResourceInteractiveLoader>(); diff --git a/doc/base/classes.xml b/doc/base/classes.xml index ce0d93b891..4b623ea590 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -556,6 +556,15 @@ Return an array with the given range. Range can be 1 argument N (0 to N-1), two arguments (initial, final-1) or three arguments (initial,final-1,increment). </description> </method> + <method name="xrange"> + <return type="Object"> + </return> + <argument index="0" name="..." type="Variant"> + </argument> + <description> + Return an iterator over the given range. Range can be 1 argument N (0 to N-1), two arguments (initial, final-1) or three arguments (initial,final-1,increment). + </description> + </method> <method name="load"> <return type="Resource"> </return> @@ -10282,7 +10291,6 @@ Returns an empty String "" at the end of the list. If your plugin is being removed, also make sure to remove your control by calling [method remove_control_from_docks]. - </description> </method> <method name="remove_control_from_docks"> @@ -27604,6 +27612,40 @@ This method controls whether the position between two cached points is interpola <constants> </constants> </class> +<class name="RangeIterator" inherits="Reference" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="is_finished"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="to_array"> + <return type="Array"> + </return> + <description> + </description> + </method> + <method name="set_range"> + <return type="Object"> + </return> + <argument index="0" name="arg1" type="var"> + </argument> + <argument index="1" name="arg2" type="var" default="NULL"> + </argument> + <argument index="2" name="arg3" type="var" default="NULL"> + </argument> + <description> + </description> + </method> + </methods> + <constants> + </constants> +</class> <class name="RawArray" category="Built-In Types"> <brief_description> Raw byte array. @@ -38652,62 +38694,85 @@ This method controls whether the position between two cached points is interpola </class> <class name="Tween" inherits="Node" category="Core"> <brief_description> + Node useful for animations with unknown start and end points. </brief_description> <description> + Node useful for animations with unknown start and end points, procedural animations, making one node follow another, and other simple behavior. + + Because it is easy to get it wrong, here is a quick usage example: + + [codeblock] + var tween = get_node("Tween") + tween.interpolate_property(get_node("Node2D_to_move"), "transform/pos", Vector2(0,0), Vector2(100,100), Tween.TRANS_LINEAR, Tween.EASE_IN_OUT) + tween.start() + [/codeblock] + + Some of the methods of this class require a property name. You can get the property name by hovering over the property in the inspector of the editor. + + Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an TRANS_* constant, and refers to the way the timing of the animation is handled (you might want to see [code]http://easings.net/[/code] for some examples). The second accepts an EASE_* constant, and controls the where [code]trans_type[/code] is applied to the interpolation (in the begining, the end, or both). If you don't know which transision and easing to pick, you can try different TRANS_* constants with EASE_IN_OUT, and use the one that looks best. </description> <methods> <method name="is_active" qualifiers="const"> <return type="bool"> </return> <description> + Returns true if any tweens are currently running, and false otherwise. Note that this method doesn't consider tweens that have ended. </description> </method> <method name="set_active"> <argument index="0" name="active" type="bool"> </argument> <description> + Activate/deactivate the tween. You can use this for pausing animations, though [method stop_all] and [method resume_all] might be more fit for this. </description> </method> <method name="is_repeat" qualifiers="const"> <return type="bool"> </return> <description> + Returns true if repeat has been set from editor GUI or [method set_repeat]. </description> </method> <method name="set_repeat"> <argument index="0" name="repeat" type="bool"> </argument> <description> + Make the tween repeat after all tweens have finished. </description> </method> <method name="set_speed"> <argument index="0" name="speed" type="float"> </argument> <description> + Set the speed multiplier of the tween. Set it to 1 for normal speed, 2 for two times nromal speed, and 0.5 for half of the normal speed. Setting it to 0 would pause the animation, but you might consider using [method set_active] or [method stop_all] and [method resume_all] for this. </description> </method> <method name="get_speed" qualifiers="const"> <return type="float"> </return> <description> + Returns the speed that has been set from editor GUI or [method set_repeat]. </description> </method> <method name="set_tween_process_mode"> <argument index="0" name="mode" type="int"> </argument> <description> + Set whether the Tween uses [code]_process[/code] or [code]_fixed_process[/code] (accepts TWEEN_PROCESS_IDLE and TWEEN_PROCESS_FIXED constants, respectively). </description> </method> <method name="get_tween_process_mode" qualifiers="const"> <return type="int"> </return> <description> + Returns the process mode that has been set from editor GUI or [method set_tween_process_mode] </description> </method> <method name="start"> <return type="bool"> </return> <description> + Start the tween node. You can define tweens both before and after this. </description> </method> <method name="reset"> @@ -38718,12 +38783,14 @@ This method controls whether the position between two cached points is interpola <argument index="1" name="key" type="String"> </argument> <description> + Resets a tween to the initial value (the one given, not the one before the tween), given its object and property/method pair. </description> </method> <method name="reset_all"> <return type="bool"> </return> <description> + Resets all tweens to their initial values (the ones given, not those before the tween). </description> </method> <method name="stop"> @@ -38734,12 +38801,14 @@ This method controls whether the position between two cached points is interpola <argument index="1" name="key" type="String"> </argument> <description> + Stop animating a tween, given its object and property/method pair. </description> </method> <method name="stop_all"> <return type="bool"> </return> <description> + Stop animating all tweens. </description> </method> <method name="resume"> @@ -38750,12 +38819,14 @@ This method controls whether the position between two cached points is interpola <argument index="1" name="key" type="String"> </argument> <description> + Continue animating a stopped tween, given its object and property/method pair. </description> </method> <method name="resume_all"> <return type="bool"> </return> <description> + Continue animating all stopped tweens. </description> </method> <method name="remove"> @@ -38766,12 +38837,14 @@ This method controls whether the position between two cached points is interpola <argument index="1" name="key" type="String"> </argument> <description> + Stop animating and completely remove a tween, given its object and property/method pair. </description> </method> <method name="remove_all"> <return type="bool"> </return> <description> + Stop animating and completely remove all tweens. </description> </method> <method name="seek"> @@ -38780,18 +38853,21 @@ This method controls whether the position between two cached points is interpola <argument index="0" name="time" type="float"> </argument> <description> + Seek the animation to the given [code]time[/code] in seconds. </description> </method> <method name="tell" qualifiers="const"> <return type="float"> </return> <description> + Returns the current time of the tween. </description> </method> <method name="get_runtime" qualifiers="const"> <return type="float"> </return> <description> + Returns the time needed for all tweens to end in seconds, measured from the start. Thus, if you have two tweens, one ending 10 seconds after the start and the other - 20 seconds, it would return 20 seconds, as by that time all tweens would have finished. </description> </method> <method name="interpolate_property"> @@ -38814,6 +38890,9 @@ This method controls whether the position between two cached points is interpola <argument index="7" name="delay" type="float" default="0"> </argument> <description> + Animate [code]property[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. + + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. </description> </method> <method name="interpolate_method"> @@ -38836,6 +38915,9 @@ This method controls whether the position between two cached points is interpola <argument index="7" name="delay" type="float" default="0"> </argument> <description> + Animate [code]method[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values. + + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. </description> </method> <method name="interpolate_callback"> @@ -38858,6 +38940,7 @@ This method controls whether the position between two cached points is interpola <argument index="7" name="arg5" type="Variant" default="NULL"> </argument> <description> + Call [code]callback[/code] of [code]object[/code] after [code]times_in_sec[/code]. [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback. </description> </method> <method name="interpolate_deferred_callback"> @@ -38880,6 +38963,7 @@ This method controls whether the position between two cached points is interpola <argument index="7" name="arg5" type="Variant" default="NULL"> </argument> <description> + Call [code]callback[/code] of [code]object[/code] after [code]times_in_sec[/code] on the main thread (similar to [methog Object.call_deferred). [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback. </description> </method> <method name="follow_property"> @@ -38904,6 +38988,9 @@ This method controls whether the position between two cached points is interpola <argument index="8" name="delay" type="float" default="0"> </argument> <description> + Follow [code]property[/code] of [code]object[/code] and apply it on [code]target_property[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Note that [code]target:target_property[/code] would equal [code]object:property[/code] at the end of the tween. + + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. </description> </method> <method name="follow_method"> @@ -38928,6 +39015,9 @@ This method controls whether the position between two cached points is interpola <argument index="8" name="delay" type="float" default="0"> </argument> <description> + Follow [code]method[/code] of [code]object[/code] and apply the returned value on [code]target_method[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] later. Methods are animated by calling them with consequitive values. + + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. </description> </method> <method name="targeting_property"> @@ -38952,6 +39042,9 @@ This method controls whether the position between two cached points is interpola <argument index="8" name="delay" type="float" default="0"> </argument> <description> + Animate [code]property[/code] of [code]object[/code] from the current value of the [code]initial_val[/code] property of [code]initial[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. + + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. </description> </method> <method name="targeting_method"> @@ -38976,6 +39069,9 @@ This method controls whether the position between two cached points is interpola <argument index="8" name="delay" type="float" default="0"> </argument> <description> + Animate [code]method[/code] of [code]object[/code] from the value returned by [code]initial.initial_method[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values. + + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. </description> </method> </methods> @@ -38986,6 +39082,7 @@ This method controls whether the position between two cached points is interpola <argument index="1" name="key" type="String"> </argument> <description> + This signal is emitted when a tween ends. </description> </signal> <signal name="tween_step"> @@ -38998,6 +39095,7 @@ This method controls whether the position between two cached points is interpola <argument index="3" name="value" type="Object"> </argument> <description> + This signal is emitted each step of the tweening. </description> </signal> <signal name="tween_start"> @@ -39006,43 +39104,61 @@ This method controls whether the position between two cached points is interpola <argument index="1" name="key" type="String"> </argument> <description> + This signal is emitted when a tween starts. </description> </signal> </signals> <constants> <constant name="TWEEN_PROCESS_FIXED" value="0"> + The [Tween] should use [code]_fixed_process[/code] for timekeeping when this is enabled. </constant> <constant name="TWEEN_PROCESS_IDLE" value="1"> + The [Tween] should use [code]_process[/code] for timekeeping when this is enabled (default). </constant> <constant name="TRANS_LINEAR" value="0"> + Means that the animation is interpolated linearly. </constant> <constant name="TRANS_SINE" value="1"> + Means that the animation is interpolated using a sine wave. </constant> <constant name="TRANS_QUINT" value="2"> + Means that the animation is interpolated with a quinary (to the power of 5) function. </constant> <constant name="TRANS_QUART" value="3"> + Means that the animation is interpolated with a quartic (to the power of 4) function. </constant> <constant name="TRANS_QUAD" value="4"> + Means that the animation is interpolated with a quadratic (to the power of 2) function. </constant> <constant name="TRANS_EXPO" value="5"> + Means that the animation is interpolated with a exponential (some number to the power of x) function. </constant> <constant name="TRANS_ELASTIC" value="6"> + Means that the animation is interpolated with elasticity, wiggling around the edges. </constant> <constant name="TRANS_CUBIC" value="7"> + Means that the animation is interpolated with a cubic (to the power of 3) function. </constant> <constant name="TRANS_CIRC" value="8"> + Means that the animation is interpolated with a function using square roots. </constant> <constant name="TRANS_BOUNCE" value="9"> + Means that the animation is interpolated by bouncing at, but never surpassing, the end. </constant> <constant name="TRANS_BACK" value="10"> + Means that the animation is interpolated backing out at edges. </constant> <constant name="EASE_IN" value="0"> + Signifies that the interpolation should be focused in the beginning. </constant> <constant name="EASE_OUT" value="1"> + Signifies that the interpolation should be focused in the end. </constant> <constant name="EASE_IN_OUT" value="2"> + Signifies that the interpolation should be focused in both ends. </constant> <constant name="EASE_OUT_IN" value="3"> + Signifies that the interpolation should be focused in both ends, but they should be switched (a bit hard to explain, try it for yourself to be sure). </constant> </constants> </class> diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 4b976c5b06..7714a5d17a 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -6639,6 +6639,7 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans } rebind=true; } + if (use_hw_skeleton_xform && skeleton!=prev_skeleton) { if (!prev_skeleton || !skeleton) rebind=true; //went from skeleton <-> no skeleton, needs rebind @@ -6715,10 +6716,6 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans if (i==0 || rebind) { material_shader.set_uniform(MaterialShaderGLES2::CAMERA_INVERSE_TRANSFORM, p_view_transform_inverse); material_shader.set_uniform(MaterialShaderGLES2::PROJECTION_TRANSFORM, p_projection); - if (skeleton && use_hw_skeleton_xform) { - material_shader.set_uniform(MaterialShaderGLES2::SKELETON_MATRICES,GL_TEXTURE0+max_texture_units-2); - material_shader.set_uniform(MaterialShaderGLES2::SKELTEX_PIXEL_SIZE,skeleton->pixel_size); - } if (!shadow) { if (!additive && current_env && current_env->fx_enabled[VS::ENV_FX_AMBIENT_LIGHT]) { @@ -6733,6 +6730,13 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans _rinfo.shader_change_count++; } + if (skeleton != prev_skeleton || rebind) { + if (skeleton) { + material_shader.set_uniform(MaterialShaderGLES2::SKELETON_MATRICES, max_texture_units - 2); + material_shader.set_uniform(MaterialShaderGLES2::SKELTEX_PIXEL_SIZE, skeleton->pixel_size); + } + } + if (e->instance->billboard || e->instance->depth_scale) { Transform xf=e->instance->transform; @@ -10819,7 +10823,6 @@ void RasterizerGLES2::init() { use_depth24 =true; s3tc_supported = true; atitc_supported = false; - use_hw_skeleton_xform = false; // use_texture_instancing=false; // use_attribute_instancing=true; use_texture_instancing=false; @@ -10830,7 +10833,11 @@ void RasterizerGLES2::init() { s3tc_srgb_supported=true; use_anisotropic_filter=true; float_linear_supported=true; - float_supported=true; + + GLint vtf; + glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS,&vtf); + float_supported = extensions.has("GL_OES_texture_float") || extensions.has("GL_ARB_texture_float"); + use_hw_skeleton_xform=vtf>0 && float_supported; read_depth_supported=_test_depth_shadow_buffer(); use_rgba_shadowmaps=!read_depth_supported; @@ -10880,7 +10887,7 @@ void RasterizerGLES2::init() { GLint vtf; glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS,&vtf); - float_supported = extensions.has("GL_OES_texture_float"); + float_supported = extensions.has("GL_OES_texture_float") || extensions.has("GL_ARB_texture_float"); use_hw_skeleton_xform=vtf>0 && float_supported; float_linear_supported = extensions.has("GL_OES_texture_float_linear"); @@ -10913,7 +10920,6 @@ void RasterizerGLES2::init() { //etc_supported=false; - use_hw_skeleton_xform=false; #endif diff --git a/godot_icon.png b/godot_icon.png Binary files differdeleted file mode 100644 index 013632ddf1..0000000000 --- a/godot_icon.png +++ /dev/null diff --git a/godot_icon.svg b/godot_icon.svg deleted file mode 100644 index 6e32074d89..0000000000 --- a/godot_icon.svg +++ /dev/null @@ -1,133 +0,0 @@ -<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1024" - height="1024" - id="svg3030" - version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="godot_icon.svg"> - <defs - id="defs3032" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.24748737" - inkscape:cx="340.91041" - inkscape:cy="224.06536" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:window-width="1366" - inkscape:window-height="748" - inkscape:window-x="-2" - inkscape:window-y="-3" - inkscape:window-maximized="1" /> - <metadata - id="metadata3035"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(0,-28.362183)"> - <rect - style="fill:#a39f9f;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="rect4009" - width="990" - height="990" - x="20" - y="47.362183" - ry="187.81349" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - d="m 116.99388,715.36604 43.13957,-74.51381 75.99672,-171.42666 271.088,-13.63746 282.06373,14.1696 138.45065,255.56931 -25.0756,66.96734 -376.12685,53.39482 -367.70391,-40.32222 z" - id="path3239" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccccccc" /> - <g - id="g3412" - transform="matrix(12.995388,0,0,-12.995388,898.37246,704.73082)"> - <path - inkscape:connector-curvature="0" - d="m 0,0 0,-3.942 c 0,-0.39 -0.25,-0.734 -0.621,-0.852 L -6.835,-6.8 c -0.273,-0.091 -0.57,-0.042 -0.8,0.128 -0.232,0.168 -0.37,0.437 -0.37,0.721 l 0,4.305 -5.818,-1.108 0,-4.381 c 0,-0.447 -0.332,-0.824 -0.775,-0.885 l -8.41,-1.152 c -0.039,-0.003 -0.081,-0.008 -0.121,-0.008 -0.214,0 -0.424,0.078 -0.588,0.22 -0.195,0.172 -0.306,0.416 -0.306,0.676 l 0,4.638 -4.341,-0.018 0,-10e-4 -0.318,10e-4 -0.319,-10e-4 0,10e-4 -4.34,0.018 0,-4.638 c 0,-0.26 -0.112,-0.504 -0.307,-0.676 -0.164,-0.142 -0.374,-0.22 -0.587,-0.22 -0.041,0 -0.082,0.005 -0.123,0.008 l -8.41,1.152 c -0.442,0.061 -0.774,0.438 -0.774,0.885 l 0,4.381 -5.819,1.108 0,-4.305 c 0,-0.284 -0.137,-0.553 -0.368,-0.721 -0.232,-0.17 -0.529,-0.219 -0.802,-0.128 l -6.215,2.006 c -0.369,0.118 -0.619,0.462 -0.619,0.852 l 0,3.942 -3.837,1.29 c -0.19,-0.811 -0.295,-1.642 -0.295,-2.481 0,-10.301 14.512,-18.252 32.448,-18.309 l 0.022,0 0.023,0 c 17.936,0.057 32.448,8.008 32.448,18.309 0,0.766 -0.088,1.521 -0.247,2.266 L 0,0 z" - style="fill:#478cbf;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path3414" /> - </g> - <g - id="g3416" - transform="matrix(12.995388,0,0,-12.995388,140.10982,467.34929)"> - <path - inkscape:connector-curvature="0" - d="m 0,0 0,-16.047 2.163,-0.729 c 0.364,-0.122 0.61,-0.462 0.61,-0.847 l 0,-3.936 4.426,-1.428 0,4.154 c 0,0.27 0.118,0.52 0.323,0.689 0.206,0.172 0.474,0.241 0.739,0.192 l 7.608,-1.452 c 0.422,-0.079 0.728,-0.448 0.728,-0.877 l 0,-4.338 6.62,-0.904 0,4.509 c 0,0.241 0.096,0.467 0.264,0.635 0.167,0.166 0.394,0.259 0.633,0.259 l 0.002,0 5.551,-0.022 5.549,0.022 c 0.245,-10e-4 0.468,-0.093 0.635,-0.259 0.169,-0.168 0.264,-0.394 0.264,-0.635 l 0,-4.509 6.621,0.904 0,4.338 c 0,0.429 0.304,0.798 0.726,0.877 l 7.609,1.452 c 0.262,0.049 0.533,-0.02 0.738,-0.192 0.205,-0.169 0.325,-0.419 0.325,-0.689 l 0,-4.154 4.425,1.428 0,3.936 c 0,0.385 0.245,0.725 0.609,0.847 l 1.475,0.497 0,16.279 0.04,0 c 1.437,1.834 2.767,3.767 4.042,5.828 -1.694,2.883 -3.768,5.459 -5.986,7.846 -2.057,-1.035 -4.055,-2.208 -5.942,-3.456 -0.944,0.938 -2.008,1.706 -3.052,2.509 -1.027,0.824 -2.183,1.428 -3.281,2.132 0.327,2.433 0.489,4.828 0.554,7.327 -2.831,1.424 -5.85,2.369 -8.903,3.047 -1.219,-2.048 -2.334,-4.267 -3.304,-6.436 -1.152,0.192 -2.309,0.264 -3.467,0.277 l 0,0.002 c -0.008,0 -0.015,-0.002 -0.022,-0.002 -0.008,0 -0.015,0.002 -0.022,0.002 l 0,-0.002 c -1.16,-0.013 -2.316,-0.085 -3.468,-0.277 -0.97,2.169 -2.084,4.388 -3.305,6.436 C 19.475,24.555 16.456,23.61 13.626,22.186 13.69,19.687 13.852,17.292 14.18,14.859 13.081,14.155 11.925,13.551 10.898,12.727 9.855,11.924 8.79,11.156 7.846,10.218 5.958,11.466 3.961,12.639 1.904,13.674 -0.314,11.287 -2.388,8.711 -4.082,5.828 -2.807,3.767 -1.477,1.834 -0.04,0 L 0,0 z" - style="fill:#478cbf;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path3418" /> - </g> - <g - id="g3420" - transform="matrix(12.995388,0,0,-12.995388,411.4457,567.42812)"> - <path - inkscape:connector-curvature="0" - d="m 0,0 c 0,-3.611 -2.926,-6.537 -6.537,-6.537 -3.608,0 -6.535,2.926 -6.535,6.537 0,3.609 2.927,6.533 6.535,6.533 C -2.926,6.533 0,3.609 0,0" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path3422" /> - </g> - <g - id="g3424" - transform="matrix(12.995388,0,0,-12.995388,391.00655,572.46636)"> - <path - inkscape:connector-curvature="0" - d="m 0,0 c 0,-2.396 -1.941,-4.337 -4.339,-4.337 -2.396,0 -4.339,1.941 -4.339,4.337 0,2.396 1.943,4.339 4.339,4.339 C -1.941,4.339 0,2.396 0,0" - style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path3426" /> - </g> - <g - id="g3428" - transform="matrix(12.995388,0,0,-12.995388,526.30933,660.10985)"> - <path - inkscape:connector-curvature="0" - d="m 0,0 c -1.162,0 -2.104,0.856 -2.104,1.912 l 0,6.018 c 0,1.054 0.942,1.912 2.104,1.912 1.162,0 2.106,-0.858 2.106,-1.912 l 0,-6.018 C 2.106,0.856 1.162,0 0,0" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path3430" /> - </g> - <g - id="g3432" - transform="matrix(12.995388,0,0,-12.995388,641.18731,567.42812)"> - <path - inkscape:connector-curvature="0" - d="m 0,0 c 0,-3.611 2.926,-6.537 6.537,-6.537 3.609,0 6.535,2.926 6.535,6.537 0,3.609 -2.926,6.533 -6.535,6.533 C 2.926,6.533 0,3.609 0,0" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path3434" /> - </g> - <g - id="g3436" - transform="matrix(12.995388,0,0,-12.995388,661.63165,572.46636)"> - <path - inkscape:connector-curvature="0" - d="m 0,0 c 0,-2.396 1.941,-4.337 4.336,-4.337 2.398,0 4.339,1.941 4.339,4.337 0,2.396 -1.941,4.339 -4.339,4.339 C 1.941,4.339 0,2.396 0,0" - style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="path3438" /> - </g> - </g> -</svg> diff --git a/icon.png b/icon.png Binary files differnew file mode 100644 index 0000000000..e334f5fa78 --- /dev/null +++ b/icon.png diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000000..34747d34fe --- /dev/null +++ b/icon.svg @@ -0,0 +1,132 @@ +<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="1024" + height="1024" + id="svg3030" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="icon.svg" + inkscape:export-filename="/home/akien/Projects/godot/godot.git/icon.png" + inkscape:export-xdpi="22.5" + inkscape:export-ydpi="22.5"> + <defs + id="defs3032" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.35" + inkscape:cx="-560.15123" + inkscape:cy="190.62119" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1015" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata3035"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-28.362183)"> + <g + id="g4149" + transform="matrix(1.0688992,0,0,1.1334985,-45.061194,-81.689066)"> + <path + sodipodi:nodetypes="cccccccccc" + inkscape:connector-curvature="0" + id="path3239" + d="m 116.99388,715.36604 43.13957,-74.51381 75.99672,-171.42666 271.088,-13.63746 282.06373,14.1696 138.45065,255.56931 -25.0756,66.96734 -376.12685,53.39482 -367.70391,-40.32222 z" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> + <g + transform="matrix(12.995388,0,0,-12.995388,898.37246,704.73082)" + id="g3412"> + <path + id="path3414" + style="fill:#478cbf;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 0,-3.942 c 0,-0.39 -0.25,-0.734 -0.621,-0.852 L -6.835,-6.8 c -0.273,-0.091 -0.57,-0.042 -0.8,0.128 -0.232,0.168 -0.37,0.437 -0.37,0.721 l 0,4.305 -5.818,-1.108 0,-4.381 c 0,-0.447 -0.332,-0.824 -0.775,-0.885 l -8.41,-1.152 c -0.039,-0.003 -0.081,-0.008 -0.121,-0.008 -0.214,0 -0.424,0.078 -0.588,0.22 -0.195,0.172 -0.306,0.416 -0.306,0.676 l 0,4.638 -4.341,-0.018 0,-10e-4 -0.318,10e-4 -0.319,-10e-4 0,10e-4 -4.34,0.018 0,-4.638 c 0,-0.26 -0.112,-0.504 -0.307,-0.676 -0.164,-0.142 -0.374,-0.22 -0.587,-0.22 -0.041,0 -0.082,0.005 -0.123,0.008 l -8.41,1.152 c -0.442,0.061 -0.774,0.438 -0.774,0.885 l 0,4.381 -5.819,1.108 0,-4.305 c 0,-0.284 -0.137,-0.553 -0.368,-0.721 -0.232,-0.17 -0.529,-0.219 -0.802,-0.128 l -6.215,2.006 c -0.369,0.118 -0.619,0.462 -0.619,0.852 l 0,3.942 -3.837,1.29 c -0.19,-0.811 -0.295,-1.642 -0.295,-2.481 0,-10.301 14.512,-18.252 32.448,-18.309 l 0.022,0 0.023,0 c 17.936,0.057 32.448,8.008 32.448,18.309 0,0.766 -0.088,1.521 -0.247,2.266 L 0,0 Z" + inkscape:connector-curvature="0" /> + </g> + <g + transform="matrix(12.995388,0,0,-12.995388,140.10982,467.34929)" + id="g3416"> + <path + id="path3418" + style="fill:#478cbf;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 0,-16.047 2.163,-0.729 c 0.364,-0.122 0.61,-0.462 0.61,-0.847 l 0,-3.936 4.426,-1.428 0,4.154 c 0,0.27 0.118,0.52 0.323,0.689 0.206,0.172 0.474,0.241 0.739,0.192 l 7.608,-1.452 c 0.422,-0.079 0.728,-0.448 0.728,-0.877 l 0,-4.338 6.62,-0.904 0,4.509 c 0,0.241 0.096,0.467 0.264,0.635 0.167,0.166 0.394,0.259 0.633,0.259 l 0.002,0 5.551,-0.022 5.549,0.022 c 0.245,-10e-4 0.468,-0.093 0.635,-0.259 0.169,-0.168 0.264,-0.394 0.264,-0.635 l 0,-4.509 6.621,0.904 0,4.338 c 0,0.429 0.304,0.798 0.726,0.877 l 7.609,1.452 c 0.262,0.049 0.533,-0.02 0.738,-0.192 0.205,-0.169 0.325,-0.419 0.325,-0.689 l 0,-4.154 4.425,1.428 0,3.936 c 0,0.385 0.245,0.725 0.609,0.847 l 1.475,0.497 0,16.279 0.04,0 c 1.437,1.834 2.767,3.767 4.042,5.828 -1.694,2.883 -3.768,5.459 -5.986,7.846 -2.057,-1.035 -4.055,-2.208 -5.942,-3.456 -0.944,0.938 -2.008,1.706 -3.052,2.509 -1.027,0.824 -2.183,1.428 -3.281,2.132 0.327,2.433 0.489,4.828 0.554,7.327 -2.831,1.424 -5.85,2.369 -8.903,3.047 -1.219,-2.048 -2.334,-4.267 -3.304,-6.436 -1.152,0.192 -2.309,0.264 -3.467,0.277 l 0,0.002 c -0.008,0 -0.015,-0.002 -0.022,-0.002 -0.008,0 -0.015,0.002 -0.022,0.002 l 0,-0.002 c -1.16,-0.013 -2.316,-0.085 -3.468,-0.277 -0.97,2.169 -2.084,4.388 -3.305,6.436 C 19.475,24.555 16.456,23.61 13.626,22.186 13.69,19.687 13.852,17.292 14.18,14.859 13.081,14.155 11.925,13.551 10.898,12.727 9.855,11.924 8.79,11.156 7.846,10.218 5.958,11.466 3.961,12.639 1.904,13.674 -0.314,11.287 -2.388,8.711 -4.082,5.828 -2.807,3.767 -1.477,1.834 -0.04,0 L 0,0 Z" + inkscape:connector-curvature="0" /> + </g> + <g + transform="matrix(12.995388,0,0,-12.995388,411.4457,567.42812)" + id="g3420"> + <path + id="path3422" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 c 0,-3.611 -2.926,-6.537 -6.537,-6.537 -3.608,0 -6.535,2.926 -6.535,6.537 0,3.609 2.927,6.533 6.535,6.533 C -2.926,6.533 0,3.609 0,0" + inkscape:connector-curvature="0" /> + </g> + <g + transform="matrix(12.995388,0,0,-12.995388,391.00655,572.46636)" + id="g3424"> + <path + id="path3426" + style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 c 0,-2.396 -1.941,-4.337 -4.339,-4.337 -2.396,0 -4.339,1.941 -4.339,4.337 0,2.396 1.943,4.339 4.339,4.339 C -1.941,4.339 0,2.396 0,0" + inkscape:connector-curvature="0" /> + </g> + <g + transform="matrix(12.995388,0,0,-12.995388,526.30933,660.10985)" + id="g3428"> + <path + id="path3430" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 c -1.162,0 -2.104,0.856 -2.104,1.912 l 0,6.018 c 0,1.054 0.942,1.912 2.104,1.912 1.162,0 2.106,-0.858 2.106,-1.912 l 0,-6.018 C 2.106,0.856 1.162,0 0,0" + inkscape:connector-curvature="0" /> + </g> + <g + transform="matrix(12.995388,0,0,-12.995388,641.18731,567.42812)" + id="g3432"> + <path + id="path3434" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 c 0,-3.611 2.926,-6.537 6.537,-6.537 3.609,0 6.535,2.926 6.535,6.537 0,3.609 -2.926,6.533 -6.535,6.533 C 2.926,6.533 0,3.609 0,0" + inkscape:connector-curvature="0" /> + </g> + <g + transform="matrix(12.995388,0,0,-12.995388,661.63165,572.46636)" + id="g3436"> + <path + id="path3438" + style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 c 0,-2.396 1.941,-4.337 4.336,-4.337 2.398,0 4.339,1.941 4.339,4.337 0,2.396 -1.941,4.339 -4.339,4.339 C 1.941,4.339 0,2.396 0,0" + inkscape:connector-curvature="0" /> + </g> + </g> + </g> +</svg> diff --git a/godot_logo.svg b/logo.svg index 98dcddfd2b..98dcddfd2b 100644 --- a/godot_logo.svg +++ b/logo.svg diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index 9b7d8eeac4..e5689d8865 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -32,6 +32,7 @@ #include "reference.h" #include "gd_script.h" #include "func_ref.h" +#include "range_iterator.h" #include "os/os.h" #include "variant_parser.h" #include "io/marshalls.h" @@ -98,6 +99,7 @@ const char *GDFunctions::get_func_name(Function p_func) { "var2bytes", "bytes2var", "range", + "xrange", "load", "inst2dict", "dict2inst", @@ -816,6 +818,81 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va } } break; + case GEN_XRANGE: { + + switch(p_arg_count) { + case 0: { + r_error.error=Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; + r_error.argument=1; + } break; + case 1: { + + VALIDATE_ARG_NUM(0); + + int count=*p_args[0]; + + Ref<RangeIterator> itr = Ref<RangeIterator>( memnew(RangeIterator) ); + if (!*itr) { + ERR_EXPLAIN("Couldn't allocate iterator!"); + r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; + ERR_FAIL(); + } + (*itr)->set_range(count); + r_ret=Variant(itr); + return; + } break; + case 2: { + + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + + int from=*p_args[0]; + int to=*p_args[1]; + + Ref<RangeIterator> itr = Ref<RangeIterator>( memnew(RangeIterator) ); + if (!*itr) { + ERR_EXPLAIN("Couldn't allocate iterator!"); + r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; + ERR_FAIL(); + } + (*itr)->set_range(from, to); + r_ret=Variant(itr); + return; + } break; + case 3: { + + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + VALIDATE_ARG_NUM(2); + + int from=*p_args[0]; + int to=*p_args[1]; + int incr=*p_args[2]; + + if (incr==0) { + ERR_EXPLAIN("step argument is zero!"); + r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; + ERR_FAIL(); + } + + Ref<RangeIterator> itr = Ref<RangeIterator>( memnew(RangeIterator) ); + if (!*itr) { + ERR_EXPLAIN("Couldn't allocate iterator!"); + r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; + ERR_FAIL(); + } + (*itr)->set_range(from, to, incr); + r_ret=Variant(itr); + return; + } break; + default: { + + r_error.error=Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS; + r_error.argument=3; + } break; + } + + } break; case RESOURCE_LOAD: { VALIDATE_ARG_COUNT(1); if (p_args[0]->get_type()!=Variant::STRING) { @@ -1433,6 +1510,12 @@ MethodInfo GDFunctions::get_info(Function p_func) { mi.return_val.type=Variant::ARRAY; return mi; } break; + case GEN_XRANGE: { + + MethodInfo mi("xrange",PropertyInfo(Variant::NIL,"...")); + mi.return_val.type=Variant::OBJECT; + return mi; + } break; case RESOURCE_LOAD: { MethodInfo mi("load",PropertyInfo(Variant::STRING,"path")); diff --git a/modules/gdscript/gd_functions.h b/modules/gdscript/gd_functions.h index 8c88472567..3a993cc038 100644 --- a/modules/gdscript/gd_functions.h +++ b/modules/gdscript/gd_functions.h @@ -92,6 +92,7 @@ public: VAR_TO_BYTES, BYTES_TO_VAR, GEN_RANGE, + GEN_XRANGE, RESOURCE_LOAD, INST2DICT, DICT2INST, diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 4f572b7b6e..4b0164d8a2 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -1779,6 +1779,20 @@ void GDParser::_parse_block(BlockNode *p_block,bool p_static) { return; } + // Little optimisation for common usage "for i in range(...):": + // don't create and initialize a possibly huge array as range() + // would do, but instead create an iterator using xrange() + if (container->type == Node::TYPE_OPERATOR) { + OperatorNode *op = static_cast<OperatorNode *>(container); + if (op->arguments.size() > 0 && + op->arguments[0]->type == Node::TYPE_BUILT_IN_FUNCTION) { + BuiltInFunctionNode *c = static_cast<BuiltInFunctionNode *>(op->arguments[0]); + if (c->function == GDFunctions::GEN_RANGE) { + c->function = GDFunctions::GEN_XRANGE; + } + } + } + ControlFlowNode *cf_for = alloc_node<ControlFlowNode>(); cf_for->cf_type=ControlFlowNode::CF_FOR; diff --git a/tools/steam/community_capsule.jpg b/tools/steam/community_capsule.jpg Binary files differdeleted file mode 100644 index abbc4793f7..0000000000 --- a/tools/steam/community_capsule.jpg +++ /dev/null diff --git a/tools/steam/community_capsule.png b/tools/steam/community_capsule.png Binary files differdeleted file mode 100644 index ec9fa0a930..0000000000 --- a/tools/steam/community_capsule.png +++ /dev/null diff --git a/tools/steam/header.png b/tools/steam/header.png Binary files differdeleted file mode 100644 index 547b28df8d..0000000000 --- a/tools/steam/header.png +++ /dev/null diff --git a/tools/steam/icon32.icns b/tools/steam/icon32.icns deleted file mode 100644 index 6234e7d5ac..0000000000 --- a/tools/steam/icon32.icns +++ /dev/null @@ -1,1029 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" - "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> -<svg width="32" height="32"> - <circle cx="0" cy="0" r="1" fill="white"/> - <circle cx="1" cy="0" r="1" fill="white"/> - <circle cx="2" cy="0" r="1" fill="white"/> - <circle cx="3" cy="0" r="1" fill="rgba(99.4095%,99.3835%,99.3835%,1)"/> - <circle cx="4" cy="0" r="1" fill="rgba(93.6355%,93.3593%,93.3593%,1)"/> - <circle cx="5" cy="0" r="1" fill="rgba(86.1707%,85.568%,85.568%,1)"/> - <circle cx="6" cy="0" r="1" fill="rgba(83.0671%,82.3316%,82.3316%,1)"/> - <circle cx="7" cy="0" r="1" fill="rgba(82.8702%,82.1271%,82.1271%,1)"/> - <circle cx="8" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="9" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="10" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="11" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="12" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="13" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="14" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="15" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="16" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="17" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="18" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="19" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="20" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="21" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="22" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="23" cy="0" r="1" fill="rgba(82.884%,82.1408%,82.1408%,1)"/> - <circle cx="24" cy="0" r="1" fill="rgba(82.8779%,82.1332%,82.1332%,1)"/> - <circle cx="25" cy="0" r="1" fill="rgba(82.9374%,82.1958%,82.1958%,1)"/> - <circle cx="26" cy="0" r="1" fill="rgba(85.2064%,84.5624%,84.5624%,1)"/> - <circle cx="27" cy="0" r="1" fill="rgba(92.0974%,91.754%,91.754%,1)"/> - <circle cx="28" cy="0" r="1" fill="rgba(98.8174%,98.7655%,98.7655%,1)"/> - <circle cx="29" cy="0" r="1" fill="white"/> - <circle cx="30" cy="0" r="1" fill="white"/> - <circle cx="31" cy="0" r="1" fill="white"/> - <circle cx="0" cy="1" r="1" fill="white"/> - <circle cx="1" cy="1" r="1" fill="white"/> - <circle cx="2" cy="1" r="1" fill="rgba(96.3653%,96.2066%,96.2066%,1)"/> - <circle cx="3" cy="1" r="1" fill="rgba(80.1495%,79.2859%,79.2859%,1)"/> - <circle cx="4" cy="1" r="1" fill="rgba(67.9744%,66.5827%,66.5827%,1)"/> - <circle cx="5" cy="1" r="1" fill="rgba(64.5335%,62.9908%,62.9908%,1)"/> - <circle cx="6" cy="1" r="1" fill="rgba(63.9979%,62.4308%,62.4308%,1)"/> - <circle cx="7" cy="1" r="1" fill="rgba(63.9811%,62.414%,62.414%,1)"/> - <circle cx="8" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="9" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="10" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="11" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="12" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="13" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="14" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="15" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="16" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="17" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="18" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="19" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="20" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="21" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="22" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="23" cy="1" r="1" fill="rgba(63.9826%,62.4155%,62.4155%,1)"/> - <circle cx="24" cy="1" r="1" fill="rgba(63.9811%,62.414%,62.414%,1)"/> - <circle cx="25" cy="1" r="1" fill="rgba(63.9841%,62.417%,62.417%,1)"/> - <circle cx="26" cy="1" r="1" fill="rgba(64.329%,62.7771%,62.7771%,1)"/> - <circle cx="27" cy="1" r="1" fill="rgba(66.8711%,65.4322%,65.4322%,1)"/> - <circle cx="28" cy="1" r="1" fill="rgba(77.0367%,76.0388%,76.0388%,1)"/> - <circle cx="29" cy="1" r="1" fill="rgba(94.0887%,93.8323%,93.8323%,1)"/> - <circle cx="30" cy="1" r="1" fill="white"/> - <circle cx="31" cy="1" r="1" fill="white"/> - <circle cx="0" cy="2" r="1" fill="white"/> - <circle cx="1" cy="2" r="1" fill="rgba(96.4508%,96.2966%,96.2966%,1)"/> - <circle cx="2" cy="2" r="1" fill="rgba(74.4732%,73.3623%,73.3623%,1)"/> - <circle cx="3" cy="2" r="1" fill="rgba(63.5355%,61.9501%,61.9501%,1)"/> - <circle cx="4" cy="2" r="1" fill="rgba(63.6469%,62.0661%,62.0661%,1)"/> - <circle cx="5" cy="2" r="1" fill="rgba(63.8956%,62.3255%,62.3255%,1)"/> - <circle cx="6" cy="2" r="1" fill="rgba(63.9185%,62.3499%,62.3499%,1)"/> - <circle cx="7" cy="2" r="1" fill="rgba(63.9185%,62.3499%,62.3499%,1)"/> - <circle cx="8" cy="2" r="1" fill="rgba(63.9185%,62.3499%,62.3499%,1)"/> - <circle cx="9" cy="2" r="1" fill="rgba(63.917%,62.3499%,62.3499%,1)"/> - <circle cx="10" cy="2" r="1" fill="rgba(63.9353%,62.3529%,62.3438%,1)"/> - <circle cx="11" cy="2" r="1" fill="rgba(64.1657%,62.4002%,62.2644%,1)"/> - <circle cx="12" cy="2" r="1" fill="rgba(64.4846%,62.4674%,62.153%,1)"/> - <circle cx="13" cy="2" r="1" fill="rgba(64.3595%,62.4414%,62.1973%,1)"/> - <circle cx="14" cy="2" r="1" fill="rgba(63.9475%,62.356%,62.3392%,1)"/> - <circle cx="15" cy="2" r="1" fill="rgba(63.917%,62.3499%,62.3499%,1)"/> - <circle cx="16" cy="2" r="1" fill="rgba(63.9185%,62.3499%,62.3499%,1)"/> - <circle cx="17" cy="2" r="1" fill="rgba(63.9094%,62.3484%,62.3529%,1)"/> - <circle cx="18" cy="2" r="1" fill="rgba(64.0864%,62.385%,62.2919%,1)"/> - <circle cx="19" cy="2" r="1" fill="rgba(64.4923%,62.4689%,62.15%,1)"/> - <circle cx="20" cy="2" r="1" fill="rgba(64.3732%,62.4445%,62.1912%,1)"/> - <circle cx="21" cy="2" r="1" fill="rgba(64.0299%,62.3728%,62.3117%,1)"/> - <circle cx="22" cy="2" r="1" fill="rgba(63.917%,62.3499%,62.3499%,1)"/> - <circle cx="23" cy="2" r="1" fill="rgba(63.9185%,62.3499%,62.3499%,1)"/> - <circle cx="24" cy="2" r="1" fill="rgba(63.9185%,62.3499%,62.3499%,1)"/> - <circle cx="25" cy="2" r="1" fill="rgba(63.9185%,62.3499%,62.3499%,1)"/> - <circle cx="26" cy="2" r="1" fill="rgba(63.9063%,62.3362%,62.3362%,1)"/> - <circle cx="27" cy="2" r="1" fill="rgba(63.7293%,62.153%,62.153%,1)"/> - <circle cx="28" cy="2" r="1" fill="rgba(63.3249%,61.7304%,61.7304%,1)"/> - <circle cx="29" cy="2" r="1" fill="rgba(70.7195%,69.4453%,69.4453%,1)"/> - <circle cx="30" cy="2" r="1" fill="rgba(93.5225%,93.2418%,93.2418%,1)"/> - <circle cx="31" cy="2" r="1" fill="white"/> - <circle cx="0" cy="3" r="1" fill="rgba(99.7345%,99.7223%,99.7223%,1)"/> - <circle cx="1" cy="3" r="1" fill="rgba(80.4944%,79.6475%,79.6475%,1)"/> - <circle cx="2" cy="3" r="1" fill="rgba(63.5645%,61.9806%,61.9806%,1)"/> - <circle cx="3" cy="3" r="1" fill="rgba(63.8788%,62.3072%,62.3072%,1)"/> - <circle cx="4" cy="3" r="1" fill="rgba(63.9231%,62.3545%,62.3545%,1)"/> - <circle cx="5" cy="3" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="6" cy="3" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="7" cy="3" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="8" cy="3" r="1" fill="rgba(63.9155%,62.3514%,62.3545%,1)"/> - <circle cx="9" cy="3" r="1" fill="rgba(64.0482%,62.3789%,62.3087%,1)"/> - <circle cx="10" cy="3" r="1" fill="rgba(63.9231%,62.3529%,62.3529%,1)"/> - <circle cx="11" cy="3" r="1" fill="rgba(60.0778%,61.5595%,63.6912%,1)"/> - <circle cx="12" cy="3" r="1" fill="rgba(52.5399%,60.0031%,66.3127%,1)"/> - <circle cx="13" cy="3" r="1" fill="rgba(52.2271%,59.939%,66.421%,1)"/> - <circle cx="14" cy="3" r="1" fill="rgba(63.5248%,62.2705%,62.4903%,1)"/> - <circle cx="15" cy="3" r="1" fill="rgba(63.9506%,62.359%,62.3423%,1)"/> - <circle cx="16" cy="3" r="1" fill="rgba(63.92%,62.3529%,62.3529%,1)"/> - <circle cx="17" cy="3" r="1" fill="rgba(64.1825%,62.4063%,62.2614%,1)"/> - <circle cx="18" cy="3" r="1" fill="rgba(59.8688%,61.5167%,63.7629%,1)"/> - <circle cx="19" cy="3" r="1" fill="rgba(49.6986%,59.4156%,67.2984%,1)"/> - <circle cx="20" cy="3" r="1" fill="rgba(56.1013%,60.737%,65.0721%,1)"/> - <circle cx="21" cy="3" r="1" fill="rgba(62.2797%,62.0142%,62.9236%,1)"/> - <circle cx="22" cy="3" r="1" fill="rgba(64.2267%,62.4155%,62.2461%,1)"/> - <circle cx="23" cy="3" r="1" fill="rgba(63.9307%,62.3545%,62.3499%,1)"/> - <circle cx="24" cy="3" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="25" cy="3" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="26" cy="3" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="27" cy="3" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="28" cy="3" r="1" fill="rgba(63.9155%,62.3468%,62.3468%,1)"/> - <circle cx="29" cy="3" r="1" fill="rgba(63.3097%,61.7136%,61.7136%,1)"/> - <circle cx="30" cy="3" r="1" fill="rgba(75.3201%,74.2473%,74.2473%,1)"/> - <circle cx="31" cy="3" r="1" fill="rgba(98.1582%,98.0774%,98.0774%,1)"/> - <circle cx="0" cy="4" r="1" fill="rgba(94.0902%,93.8338%,93.8338%,1)"/> - <circle cx="1" cy="4" r="1" fill="rgba(68.3284%,66.952%,66.952%,1)"/> - <circle cx="2" cy="4" r="1" fill="rgba(63.624%,62.0432%,62.0432%,1)"/> - <circle cx="3" cy="4" r="1" fill="rgba(63.9231%,62.3545%,62.3545%,1)"/> - <circle cx="4" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="5" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="6" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="7" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="8" cy="4" r="1" fill="rgba(64.0742%,62.385%,62.2995%,1)"/> - <circle cx="9" cy="4" r="1" fill="rgba(61.6526%,61.883%,63.1418%,1)"/> - <circle cx="10" cy="4" r="1" fill="rgba(44.9165%,58.4268%,68.9631%,1)"/> - <circle cx="11" cy="4" r="1" fill="rgba(33.312%,56.0311%,73.0007%,1)"/> - <circle cx="12" cy="4" r="1" fill="rgba(28.397%,55.0164%,74.7097%,1)"/> - <circle cx="13" cy="4" r="1" fill="rgba(31.1406%,55.5825%,73.7545%,1)"/> - <circle cx="14" cy="4" r="1" fill="rgba(56.8887%,60.8988%,64.799%,1)"/> - <circle cx="15" cy="4" r="1" fill="rgba(64.5869%,62.4903%,62.121%,1)"/> - <circle cx="16" cy="4" r="1" fill="rgba(64.2451%,62.4201%,62.24%,1)"/> - <circle cx="17" cy="4" r="1" fill="rgba(64.1703%,62.4048%,62.2675%,1)"/> - <circle cx="18" cy="4" r="1" fill="rgba(45.1087%,58.4695%,68.8975%,1)"/> - <circle cx="19" cy="4" r="1" fill="rgba(27.5746%,54.847%,74.995%,1)"/> - <circle cx="20" cy="4" r="1" fill="rgba(30.0328%,55.3536%,74.139%,1)"/> - <circle cx="21" cy="4" r="1" fill="rgba(37.0352%,56.8002%,71.7037%,1)"/> - <circle cx="22" cy="4" r="1" fill="rgba(52.9259%,60.0824%,66.1769%,1)"/> - <circle cx="23" cy="4" r="1" fill="rgba(64.033%,62.3758%,62.3133%,1)"/> - <circle cx="24" cy="4" r="1" fill="rgba(63.9261%,62.3545%,62.3514%,1)"/> - <circle cx="25" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="26" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="27" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="28" cy="4" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="29" cy="4" r="1" fill="rgba(63.8087%,62.2354%,62.2354%,1)"/> - <circle cx="30" cy="4" r="1" fill="rgba(65.6138%,64.1199%,64.1199%,1)"/> - <circle cx="31" cy="4" r="1" fill="rgba(89.1127%,88.6397%,88.6397%,1)"/> - <circle cx="0" cy="5" r="1" fill="rgba(87.0603%,86.4988%,86.4988%,1)"/> - <circle cx="1" cy="5" r="1" fill="rgba(64.7318%,63.1983%,63.1983%,1)"/> - <circle cx="2" cy="5" r="1" fill="rgba(63.8849%,62.3148%,62.3148%,1)"/> - <circle cx="3" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="4" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="5" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="6" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="7" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="8" cy="5" r="1" fill="rgba(64.2771%,62.4262%,62.2293%,1)"/> - <circle cx="9" cy="5" r="1" fill="rgba(58.4024%,61.2131%,64.2725%,1)"/> - <circle cx="10" cy="5" r="1" fill="rgba(30.7561%,55.5032%,73.8888%,1)"/> - <circle cx="11" cy="5" r="1" fill="rgba(27.277%,54.7845%,75.0988%,1)"/> - <circle cx="12" cy="5" r="1" fill="rgba(27.7897%,54.8913%,74.9203%,1)"/> - <circle cx="13" cy="5" r="1" fill="rgba(27.4037%,54.8104%,75.0546%,1)"/> - <circle cx="14" cy="5" r="1" fill="rgba(42.3804%,57.9034%,69.8451%,1)"/> - <circle cx="15" cy="5" r="1" fill="rgba(59.8184%,61.5045%,63.7797%,1)"/> - <circle cx="16" cy="5" r="1" fill="rgba(59.53%,61.4466%,63.8804%,1)"/> - <circle cx="17" cy="5" r="1" fill="rgba(55.9915%,60.7156%,65.1118%,1)"/> - <circle cx="18" cy="5" r="1" fill="rgba(32.3003%,55.8236%,73.3516%,1)"/> - <circle cx="19" cy="5" r="1" fill="rgba(27.538%,54.8394%,75.0088%,1)"/> - <circle cx="20" cy="5" r="1" fill="rgba(27.6982%,54.8714%,74.9523%,1)"/> - <circle cx="21" cy="5" r="1" fill="rgba(26.7277%,54.6715%,75.2895%,1)"/> - <circle cx="22" cy="5" r="1" fill="rgba(41.6068%,57.7447%,70.1152%,1)"/> - <circle cx="23" cy="5" r="1" fill="rgba(63.9902%,62.3667%,62.3285%,1)"/> - <circle cx="24" cy="5" r="1" fill="rgba(63.9292%,62.3545%,62.3499%,1)"/> - <circle cx="25" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="26" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="27" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="28" cy="5" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="29" cy="5" r="1" fill="rgba(63.9231%,62.3545%,62.3545%,1)"/> - <circle cx="30" cy="5" r="1" fill="rgba(63.7751%,62.2004%,62.2004%,1)"/> - <circle cx="31" cy="5" r="1" fill="rgba(80.5188%,79.6735%,79.6735%,1)"/> - <circle cx="0" cy="6" r="1" fill="rgba(84.1505%,83.4607%,83.4607%,1)"/> - <circle cx="1" cy="6" r="1" fill="rgba(64.1398%,62.5803%,62.5803%,1)"/> - <circle cx="2" cy="6" r="1" fill="rgba(63.9139%,62.3453%,62.3453%,1)"/> - <circle cx="3" cy="6" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="4" cy="6" r="1" fill="rgba(63.9292%,62.3545%,62.3499%,1)"/> - <circle cx="5" cy="6" r="1" fill="rgba(63.9414%,62.3575%,62.3453%,1)"/> - <circle cx="6" cy="6" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="7" cy="6" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="8" cy="6" r="1" fill="rgba(64.1917%,62.4079%,62.2599%,1)"/> - <circle cx="9" cy="6" r="1" fill="rgba(59.9573%,61.5335%,63.7308%,1)"/> - <circle cx="10" cy="6" r="1" fill="rgba(32.5353%,55.8709%,73.2692%,1)"/> - <circle cx="11" cy="6" r="1" fill="rgba(27.541%,54.8394%,75.0072%,1)"/> - <circle cx="12" cy="6" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="13" cy="6" r="1" fill="rgba(27.747%,54.8821%,74.9355%,1)"/> - <circle cx="14" cy="6" r="1" fill="rgba(29.1798%,55.1781%,74.4366%,1)"/> - <circle cx="15" cy="6" r="1" fill="rgba(32.2942%,55.8206%,73.3532%,1)"/> - <circle cx="16" cy="6" r="1" fill="rgba(31.9921%,55.758%,73.4585%,1)"/> - <circle cx="17" cy="6" r="1" fill="rgba(31.5404%,55.6649%,73.6156%,1)"/> - <circle cx="18" cy="6" r="1" fill="rgba(27.9637%,54.9264%,74.8608%,1)"/> - <circle cx="19" cy="6" r="1" fill="rgba(27.8355%,54.9004%,74.905%,1)"/> - <circle cx="20" cy="6" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="21" cy="6" r="1" fill="rgba(27.2587%,54.7814%,75.1049%,1)"/> - <circle cx="22" cy="6" r="1" fill="rgba(44.1566%,58.2712%,69.2271%,1)"/> - <circle cx="23" cy="6" r="1" fill="rgba(64.3381%,62.4384%,62.208%,1)"/> - <circle cx="24" cy="6" r="1" fill="rgba(63.9185%,62.3529%,62.3545%,1)"/> - <circle cx="25" cy="6" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="26" cy="6" r="1" fill="rgba(63.9261%,62.3545%,62.3514%,1)"/> - <circle cx="27" cy="6" r="1" fill="rgba(63.9445%,62.3575%,62.3453%,1)"/> - <circle cx="28" cy="6" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="29" cy="6" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="30" cy="6" r="1" fill="rgba(63.6118%,62.031%,62.031%,1)"/> - <circle cx="31" cy="6" r="1" fill="rgba(77.3739%,76.3897%,76.3897%,1)"/> - <circle cx="0" cy="7" r="1" fill="rgba(83.9826%,83.2868%,83.2868%,1)"/> - <circle cx="1" cy="7" r="1" fill="rgba(64.1215%,62.562%,62.562%,1)"/> - <circle cx="2" cy="7" r="1" fill="rgba(63.9139%,62.3453%,62.3453%,1)"/> - <circle cx="3" cy="7" r="1" fill="rgba(63.9368%,62.356%,62.3484%,1)"/> - <circle cx="4" cy="7" r="1" fill="rgba(64.0253%,62.3743%,62.3163%,1)"/> - <circle cx="5" cy="7" r="1" fill="rgba(63.8834%,62.3453%,62.3667%,1)"/> - <circle cx="6" cy="7" r="1" fill="rgba(64.2954%,62.4308%,62.2232%,1)"/> - <circle cx="7" cy="7" r="1" fill="rgba(63.9826%,62.3651%,62.3316%,1)"/> - <circle cx="8" cy="7" r="1" fill="rgba(64.4434%,62.4613%,62.1714%,1)"/> - <circle cx="9" cy="7" r="1" fill="rgba(58.0041%,61.1307%,64.4114%,1)"/> - <circle cx="10" cy="7" r="1" fill="rgba(32.5475%,55.874%,73.2647%,1)"/> - <circle cx="11" cy="7" r="1" fill="rgba(27.5395%,54.8394%,75.0072%,1)"/> - <circle cx="12" cy="7" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="13" cy="7" r="1" fill="rgba(27.8492%,54.9035%,74.9004%,1)"/> - <circle cx="14" cy="7" r="1" fill="rgba(27.7485%,54.8821%,74.9355%,1)"/> - <circle cx="15" cy="7" r="1" fill="rgba(27.5547%,54.8425%,75.0027%,1)"/> - <circle cx="16" cy="7" r="1" fill="rgba(27.5746%,54.847%,74.995%,1)"/> - <circle cx="17" cy="7" r="1" fill="rgba(27.6005%,54.8516%,74.9859%,1)"/> - <circle cx="18" cy="7" r="1" fill="rgba(27.8294%,54.8989%,74.9065%,1)"/> - <circle cx="19" cy="7" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="20" cy="7" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="21" cy="7" r="1" fill="rgba(27.4083%,54.8119%,75.053%,1)"/> - <circle cx="22" cy="7" r="1" fill="rgba(43.1098%,58.0545%,69.5918%,1)"/> - <circle cx="23" cy="7" r="1" fill="rgba(63.2868%,62.2217%,62.5727%,1)"/> - <circle cx="24" cy="7" r="1" fill="rgba(64.2115%,62.4125%,62.2522%,1)"/> - <circle cx="25" cy="7" r="1" fill="rgba(64.0497%,62.3789%,62.3087%,1)"/> - <circle cx="26" cy="7" r="1" fill="rgba(64.2679%,62.4247%,62.2324%,1)"/> - <circle cx="27" cy="7" r="1" fill="rgba(63.7995%,62.3285%,62.3941%,1)"/> - <circle cx="28" cy="7" r="1" fill="rgba(64.0497%,62.3789%,62.3087%,1)"/> - <circle cx="29" cy="7" r="1" fill="rgba(63.9139%,62.3514%,62.356%,1)"/> - <circle cx="30" cy="7" r="1" fill="rgba(63.6118%,62.0294%,62.0294%,1)"/> - <circle cx="31" cy="7" r="1" fill="rgba(77.2%,76.2097%,76.2097%,1)"/> - <circle cx="0" cy="8" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="8" r="1" fill="rgba(64.123%,62.5635%,62.5635%,1)"/> - <circle cx="2" cy="8" r="1" fill="rgba(63.9139%,62.3453%,62.3453%,1)"/> - <circle cx="3" cy="8" r="1" fill="rgba(64.3183%,62.4353%,62.2156%,1)"/> - <circle cx="4" cy="8" r="1" fill="rgba(54.4976%,60.4059%,65.6306%,1)"/> - <circle cx="5" cy="8" r="1" fill="rgba(43.093%,58.0514%,69.5964%,1)"/> - <circle cx="6" cy="8" r="1" fill="rgba(56.6781%,60.8576%,64.8707%,1)"/> - <circle cx="7" cy="8" r="1" fill="rgba(63.5706%,62.2797%,62.475%,1)"/> - <circle cx="8" cy="8" r="1" fill="rgba(53.4112%,60.1831%,66.0105%,1)"/> - <circle cx="9" cy="8" r="1" fill="rgba(34.8653%,56.3531%,72.4605%,1)"/> - <circle cx="10" cy="8" r="1" fill="rgba(28.0003%,54.934%,74.847%,1)"/> - <circle cx="11" cy="8" r="1" fill="rgba(27.8218%,54.8974%,74.9096%,1)"/> - <circle cx="12" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="13" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="14" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="15" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="16" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="18" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="19" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="20" cy="8" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="21" cy="8" r="1" fill="rgba(27.7638%,54.8852%,74.9294%,1)"/> - <circle cx="22" cy="8" r="1" fill="rgba(29.3889%,55.2209%,74.3648%,1)"/> - <circle cx="23" cy="8" r="1" fill="rgba(42.1057%,57.847%,69.9428%,1)"/> - <circle cx="24" cy="8" r="1" fill="rgba(60.0214%,61.5488%,63.711%,1)"/> - <circle cx="25" cy="8" r="1" fill="rgba(62.3774%,62.034%,62.8901%,1)"/> - <circle cx="26" cy="8" r="1" fill="rgba(50.1381%,59.5071%,67.1458%,1)"/> - <circle cx="27" cy="8" r="1" fill="rgba(44.358%,58.3124%,69.1569%,1)"/> - <circle cx="28" cy="8" r="1" fill="rgba(61.4038%,61.8341%,63.2288%,1)"/> - <circle cx="29" cy="8" r="1" fill="rgba(64.1459%,62.3987%,62.2751%,1)"/> - <circle cx="30" cy="8" r="1" fill="rgba(63.6072%,62.0294%,62.031%,1)"/> - <circle cx="31" cy="8" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="9" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="9" r="1" fill="rgba(64.1184%,62.562%,62.565%,1)"/> - <circle cx="2" cy="9" r="1" fill="rgba(64.2924%,62.4231%,62.2141%,1)"/> - <circle cx="3" cy="9" r="1" fill="rgba(58.0743%,61.146%,64.387%,1)"/> - <circle cx="4" cy="9" r="1" fill="rgba(33.9574%,56.1654%,72.7749%,1)"/> - <circle cx="5" cy="9" r="1" fill="rgba(27.0375%,54.7356%,75.1812%,1)"/> - <circle cx="6" cy="9" r="1" fill="rgba(31.8013%,55.7183%,73.5241%,1)"/> - <circle cx="7" cy="9" r="1" fill="rgba(40.5859%,57.5326%,70.4677%,1)"/> - <circle cx="8" cy="9" r="1" fill="rgba(30.8248%,55.5169%,73.8643%,1)"/> - <circle cx="9" cy="9" r="1" fill="rgba(27.3732%,54.8043%,75.0652%,1)"/> - <circle cx="10" cy="9" r="1" fill="rgba(27.8279%,54.8989%,74.9081%,1)"/> - <circle cx="11" cy="9" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="12" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="13" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="14" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="15" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="16" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="18" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="19" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="20" cy="9" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="21" cy="9" r="1" fill="rgba(27.8477%,54.9035%,74.9004%,1)"/> - <circle cx="22" cy="9" r="1" fill="rgba(27.7104%,54.8745%,74.9477%,1)"/> - <circle cx="23" cy="9" r="1" fill="rgba(27.5364%,54.8379%,75.0088%,1)"/> - <circle cx="24" cy="9" r="1" fill="rgba(36.0464%,56.5972%,72.05%,1)"/> - <circle cx="25" cy="9" r="1" fill="rgba(38.3337%,57.0687%,71.2535%,1)"/> - <circle cx="26" cy="9" r="1" fill="rgba(28.5618%,55.05%,74.6517%,1)"/> - <circle cx="27" cy="9" r="1" fill="rgba(27.6051%,54.8531%,74.9844%,1)"/> - <circle cx="28" cy="9" r="1" fill="rgba(44.1382%,58.2681%,69.2332%,1)"/> - <circle cx="29" cy="9" r="1" fill="rgba(63.2853%,62.2217%,62.5742%,1)"/> - <circle cx="30" cy="9" r="1" fill="rgba(63.6927%,62.0462%,62.002%,1)"/> - <circle cx="31" cy="9" r="1" fill="rgba(77.2137%,76.2219%,76.2234%,1)"/> - <circle cx="0" cy="10" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="10" r="1" fill="rgba(64.2542%,62.591%,62.5177%,1)"/> - <circle cx="2" cy="10" r="1" fill="rgba(61.9684%,61.944%,63.0228%,1)"/> - <circle cx="3" cy="10" r="1" fill="rgba(39.4156%,57.293%,70.8766%,1)"/> - <circle cx="4" cy="10" r="1" fill="rgba(27.3579%,54.8013%,75.0713%,1)"/> - <circle cx="5" cy="10" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="6" cy="10" r="1" fill="rgba(27.6158%,54.8547%,74.9813%,1)"/> - <circle cx="7" cy="10" r="1" fill="rgba(27.3198%,54.7936%,75.0835%,1)"/> - <circle cx="8" cy="10" r="1" fill="rgba(27.6753%,54.8669%,74.9599%,1)"/> - <circle cx="9" cy="10" r="1" fill="rgba(27.8508%,54.9035%,74.8989%,1)"/> - <circle cx="10" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="11" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="12" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="13" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="14" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="15" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="16" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="18" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="19" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="20" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="21" cy="10" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="22" cy="10" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="23" cy="10" r="1" fill="rgba(27.8294%,54.8989%,74.9065%,1)"/> - <circle cx="24" cy="10" r="1" fill="rgba(27.4815%,54.8272%,75.0286%,1)"/> - <circle cx="25" cy="10" r="1" fill="rgba(27.3777%,54.8058%,75.0637%,1)"/> - <circle cx="26" cy="10" r="1" fill="rgba(27.7745%,54.8882%,74.9264%,1)"/> - <circle cx="27" cy="10" r="1" fill="rgba(27.6905%,54.8699%,74.9554%,1)"/> - <circle cx="28" cy="10" r="1" fill="rgba(29.1783%,55.1781%,74.4366%,1)"/> - <circle cx="29" cy="10" r="1" fill="rgba(51.107%,59.707%,66.8101%,1)"/> - <circle cx="30" cy="10" r="1" fill="rgba(63.8773%,62.0844%,61.9379%,1)"/> - <circle cx="31" cy="10" r="1" fill="rgba(77.2213%,76.2249%,76.2203%,1)"/> - <circle cx="0" cy="11" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="11" r="1" fill="rgba(64.4862%,62.6383%,62.4384%,1)"/> - <circle cx="2" cy="11" r="1" fill="rgba(57.8683%,61.0971%,64.448%,1)"/> - <circle cx="3" cy="11" r="1" fill="rgba(31.2123%,55.5978%,73.7301%,1)"/> - <circle cx="4" cy="11" r="1" fill="rgba(27.5608%,54.844%,74.9996%,1)"/> - <circle cx="5" cy="11" r="1" fill="rgba(27.8462%,54.902%,74.9004%,1)"/> - <circle cx="6" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="7" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="8" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="9" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="10" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="11" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="12" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="13" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="14" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="15" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="16" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="18" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="19" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="20" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="21" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="22" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="23" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="24" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="25" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="26" cy="11" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="27" cy="11" r="1" fill="rgba(27.8538%,54.9035%,74.8989%,1)"/> - <circle cx="28" cy="11" r="1" fill="rgba(27.1351%,54.7555%,75.1476%,1)"/> - <circle cx="29" cy="11" r="1" fill="rgba(41.6251%,57.7493%,70.1091%,1)"/> - <circle cx="30" cy="11" r="1" fill="rgba(63.3539%,61.976%,62.1195%,1)"/> - <circle cx="31" cy="11" r="1" fill="rgba(77.2473%,76.2295%,76.2112%,1)"/> - <circle cx="0" cy="12" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="12" r="1" fill="rgba(64.1672%,62.5727%,62.5483%,1)"/> - <circle cx="2" cy="12" r="1" fill="rgba(63.5431%,62.269%,62.475%,1)"/> - <circle cx="3" cy="12" r="1" fill="rgba(45.1118%,58.4695%,68.896%,1)"/> - <circle cx="4" cy="12" r="1" fill="rgba(27.8965%,54.9126%,74.8836%,1)"/> - <circle cx="5" cy="12" r="1" fill="rgba(27.8141%,54.8959%,74.9126%,1)"/> - <circle cx="6" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="7" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="8" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="9" cy="12" r="1" fill="rgba(27.7699%,54.8562%,74.876%,1)"/> - <circle cx="10" cy="12" r="1" fill="rgba(27.7226%,54.8272%,74.8608%,1)"/> - <circle cx="11" cy="12" r="1" fill="rgba(27.8309%,54.8943%,74.8974%,1)"/> - <circle cx="12" cy="12" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="13" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="14" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="15" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="16" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="18" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="19" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="20" cy="12" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="21" cy="12" r="1" fill="rgba(27.8233%,54.8898%,74.8943%,1)"/> - <circle cx="22" cy="12" r="1" fill="rgba(27.715%,54.8226%,74.8577%,1)"/> - <circle cx="23" cy="12" r="1" fill="rgba(27.7836%,54.8653%,74.8806%,1)"/> - <circle cx="24" cy="12" r="1" fill="rgba(27.8447%,54.9035%,74.902%,1)"/> - <circle cx="25" cy="12" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="26" cy="12" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="27" cy="12" r="1" fill="rgba(27.5837%,54.8486%,74.992%,1)"/> - <circle cx="28" cy="12" r="1" fill="rgba(31.8257%,55.7259%,73.518%,1)"/> - <circle cx="29" cy="12" r="1" fill="rgba(56.1975%,60.7599%,65.0416%,1)"/> - <circle cx="30" cy="12" r="1" fill="rgba(63.9475%,62.0996%,61.912%,1)"/> - <circle cx="31" cy="12" r="1" fill="rgba(77.2137%,76.2234%,76.2219%,1)"/> - <circle cx="0" cy="13" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="13" r="1" fill="rgba(64.1215%,62.5635%,62.565%,1)"/> - <circle cx="2" cy="13" r="1" fill="rgba(64.1428%,62.3926%,62.266%,1)"/> - <circle cx="3" cy="13" r="1" fill="rgba(61.0788%,61.767%,63.3417%,1)"/> - <circle cx="4" cy="13" r="1" fill="rgba(36.35%,56.6598%,71.9417%,1)"/> - <circle cx="5" cy="13" r="1" fill="rgba(27.4098%,54.8119%,75.053%,1)"/> - <circle cx="6" cy="13" r="1" fill="rgba(27.8447%,54.9035%,74.902%,1)"/> - <circle cx="7" cy="13" r="1" fill="rgba(27.8126%,54.8821%,74.8913%,1)"/> - <circle cx="8" cy="13" r="1" fill="rgba(27.1183%,54.4488%,74.6487%,1)"/> - <circle cx="9" cy="13" r="1" fill="rgba(28.7739%,55.4894%,75.2361%,1)"/> - <circle cx="10" cy="13" r="1" fill="rgba(29.8528%,56.1852%,75.6481%,1)"/> - <circle cx="11" cy="13" r="1" fill="rgba(27.3213%,54.58%,74.728%,1)"/> - <circle cx="12" cy="13" r="1" fill="rgba(27.5837%,54.7387%,74.8104%,1)"/> - <circle cx="13" cy="13" r="1" fill="rgba(27.8569%,54.9096%,74.9065%,1)"/> - <circle cx="14" cy="13" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="15" cy="13" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="16" cy="13" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="13" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="18" cy="13" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="19" cy="13" r="1" fill="rgba(27.8599%,54.9126%,74.9081%,1)"/> - <circle cx="20" cy="13" r="1" fill="rgba(27.4922%,54.6822%,74.7784%,1)"/> - <circle cx="21" cy="13" r="1" fill="rgba(27.4998%,54.6929%,74.7936%,1)"/> - <circle cx="22" cy="13" r="1" fill="rgba(30.0084%,56.2829%,75.7015%,1)"/> - <circle cx="23" cy="13" r="1" fill="rgba(28.4535%,55.288%,75.1217%,1)"/> - <circle cx="24" cy="13" r="1" fill="rgba(27.1687%,54.4793%,74.667%,1)"/> - <circle cx="25" cy="13" r="1" fill="rgba(27.8386%,54.8989%,74.9004%,1)"/> - <circle cx="26" cy="13" r="1" fill="rgba(27.8111%,54.8959%,74.9142%,1)"/> - <circle cx="27" cy="13" r="1" fill="rgba(28.1178%,54.9584%,74.8058%,1)"/> - <circle cx="28" cy="13" r="1" fill="rgba(48.1849%,59.1043%,67.8264%,1)"/> - <circle cx="29" cy="13" r="1" fill="rgba(64.2191%,62.414%,62.2492%,1)"/> - <circle cx="30" cy="13" r="1" fill="rgba(63.6271%,62.0325%,62.0233%,1)"/> - <circle cx="31" cy="13" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="14" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="14" r="1" fill="rgba(64.123%,62.5635%,62.5635%,1)"/> - <circle cx="2" cy="14" r="1" fill="rgba(63.9139%,62.3453%,62.3453%,1)"/> - <circle cx="3" cy="14" r="1" fill="rgba(64.1398%,62.3987%,62.2766%,1)"/> - <circle cx="4" cy="14" r="1" fill="rgba(42.1439%,57.8546%,69.9229%,1)"/> - <circle cx="5" cy="14" r="1" fill="rgba(27.2068%,54.7707%,75.1232%,1)"/> - <circle cx="6" cy="14" r="1" fill="rgba(27.8233%,54.8898%,74.8943%,1)"/> - <circle cx="7" cy="14" r="1" fill="rgba(27.6844%,54.7997%,74.8409%,1)"/> - <circle cx="8" cy="14" r="1" fill="rgba(46.2409%,66.4668%,81.416%,1)"/> - <circle cx="9" cy="14" r="1" fill="rgba(75.7458%,84.9928%,91.8227%,1)"/> - <circle cx="10" cy="14" r="1" fill="rgba(79.2706%,86.6392%,92.1019%,1)"/> - <circle cx="11" cy="14" r="1" fill="rgba(60.3326%,75.3948%,86.5232%,1)"/> - <circle cx="12" cy="14" r="1" fill="rgba(31.3344%,57.1313%,76.1959%,1)"/> - <circle cx="13" cy="14" r="1" fill="rgba(27.5731%,54.7311%,74.8043%,1)"/> - <circle cx="14" cy="14" r="1" fill="rgba(27.8584%,54.9111%,74.9081%,1)"/> - <circle cx="15" cy="14" r="1" fill="rgba(27.5731%,54.7326%,74.8089%,1)"/> - <circle cx="16" cy="14" r="1" fill="rgba(26.8971%,54.3114%,74.5724%,1)"/> - <circle cx="17" cy="14" r="1" fill="rgba(27.6524%,54.7829%,74.8363%,1)"/> - <circle cx="18" cy="14" r="1" fill="rgba(27.8569%,54.9111%,74.9065%,1)"/> - <circle cx="19" cy="14" r="1" fill="rgba(27.4693%,54.6639%,74.7646%,1)"/> - <circle cx="20" cy="14" r="1" fill="rgba(33.1945%,58.32%,76.8872%,1)"/> - <circle cx="21" cy="14" r="1" fill="rgba(63.5966%,77.3907%,87.5822%,1)"/> - <circle cx="22" cy="14" r="1" fill="rgba(79.881%,87.0237%,92.3201%,1)"/> - <circle cx="23" cy="14" r="1" fill="rgba(73.7942%,83.8163%,91.2154%,1)"/> - <circle cx="24" cy="14" r="1" fill="rgba(42.7893%,64.2863%,80.174%,1)"/> - <circle cx="25" cy="14" r="1" fill="rgba(27.4311%,54.6426%,74.7555%,1)"/> - <circle cx="26" cy="14" r="1" fill="rgba(27.7577%,54.8836%,74.931%,1)"/> - <circle cx="27" cy="14" r="1" fill="rgba(29.2332%,55.1888%,74.4167%,1)"/> - <circle cx="28" cy="14" r="1" fill="rgba(55.2972%,60.5707%,65.3468%,1)"/> - <circle cx="29" cy="14" r="1" fill="rgba(64.4755%,62.4674%,62.1607%,1)"/> - <circle cx="30" cy="14" r="1" fill="rgba(63.6103%,62.0294%,62.0294%,1)"/> - <circle cx="31" cy="14" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="15" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="15" r="1" fill="rgba(64.123%,62.5635%,62.5635%,1)"/> - <circle cx="2" cy="15" r="1" fill="rgba(63.9216%,62.3468%,62.3438%,1)"/> - <circle cx="3" cy="15" r="1" fill="rgba(64.0162%,62.3728%,62.3194%,1)"/> - <circle cx="4" cy="15" r="1" fill="rgba(42.0249%,57.8302%,69.9641%,1)"/> - <circle cx="5" cy="15" r="1" fill="rgba(27.2145%,54.7723%,75.1202%,1)"/> - <circle cx="6" cy="15" r="1" fill="rgba(27.1321%,54.4579%,74.6548%,1)"/> - <circle cx="7" cy="15" r="1" fill="rgba(40.5112%,62.8794%,79.4095%,1)"/> - <circle cx="8" cy="15" r="1" fill="rgba(88.3421%,91.8837%,94.5296%,1)"/> - <circle cx="9" cy="15" r="1" fill="rgba(69.34%,68.5878%,68.4962%,1)"/> - <circle cx="10" cy="15" r="1" fill="rgba(49.5277%,48.7846%,48.983%,1)"/> - <circle cx="11" cy="15" r="1" fill="rgba(70.7088%,70.6935%,71.0994%,1)"/> - <circle cx="12" cy="15" r="1" fill="rgba(59.8657%,74.4808%,85.2995%,1)"/> - <circle cx="13" cy="15" r="1" fill="rgba(27.5792%,54.7738%,74.873%,1)"/> - <circle cx="14" cy="15" r="1" fill="rgba(27.5868%,54.7417%,74.8119%,1)"/> - <circle cx="15" cy="15" r="1" fill="rgba(32.2637%,57.6654%,76.4401%,1)"/> - <circle cx="16" cy="15" r="1" fill="rgba(43.9353%,64.9607%,80.5005%,1)"/> - <circle cx="17" cy="15" r="1" fill="rgba(30.9255%,56.8292%,75.9747%,1)"/> - <circle cx="18" cy="15" r="1" fill="rgba(27.6005%,54.7509%,74.818%,1)"/> - <circle cx="19" cy="15" r="1" fill="rgba(28.4733%,55.3597%,75.2316%,1)"/> - <circle cx="20" cy="15" r="1" fill="rgba(64.7044%,77.0443%,86.1997%,1)"/> - <circle cx="21" cy="15" r="1" fill="rgba(67.7058%,67.3045%,67.4815%,1)"/> - <circle cx="22" cy="15" r="1" fill="rgba(49.5399%,48.8151%,49.0227%,1)"/> - <circle cx="23" cy="15" r="1" fill="rgba(73.4035%,72.6528%,72.5048%,1)"/> - <circle cx="24" cy="15" r="1" fill="rgba(85.449%,90.5135%,94.2702%,1)"/> - <circle cx="25" cy="15" r="1" fill="rgba(36.5072%,60.351%,77.9736%,1)"/> - <circle cx="26" cy="15" r="1" fill="rgba(27.2267%,54.5525%,74.7463%,1)"/> - <circle cx="27" cy="15" r="1" fill="rgba(29.2271%,55.1873%,74.4182%,1)"/> - <circle cx="28" cy="15" r="1" fill="rgba(55.1003%,60.531%,65.4154%,1)"/> - <circle cx="29" cy="15" r="1" fill="rgba(64.448%,62.4613%,62.1698%,1)"/> - <circle cx="30" cy="15" r="1" fill="rgba(63.6118%,62.0294%,62.0294%,1)"/> - <circle cx="31" cy="15" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="16" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="16" r="1" fill="rgba(64.123%,62.5635%,62.5635%,1)"/> - <circle cx="2" cy="16" r="1" fill="rgba(63.9216%,62.3468%,62.3438%,1)"/> - <circle cx="3" cy="16" r="1" fill="rgba(64.0146%,62.3728%,62.3194%,1)"/> - <circle cx="4" cy="16" r="1" fill="rgba(42.0233%,57.8302%,69.9641%,1)"/> - <circle cx="5" cy="16" r="1" fill="rgba(27.2145%,54.7723%,75.1202%,1)"/> - <circle cx="6" cy="16" r="1" fill="rgba(26.6407%,54.1497%,74.4839%,1)"/> - <circle cx="7" cy="16" r="1" fill="rgba(58.6587%,74.5525%,86.2852%,1)"/> - <circle cx="8" cy="16" r="1" fill="rgba(82.0249%,81.8204%,81.9333%,1)"/> - <circle cx="9" cy="16" r="1" fill="rgba(28.7587%,28.3772%,29.1234%,1)"/> - <circle cx="10" cy="16" r="1" fill="rgba(23.592%,23.1922%,23.9963%,1)"/> - <circle cx="11" cy="16" r="1" fill="rgba(32.3705%,31.5923%,32.0089%,1)"/> - <circle cx="12" cy="16" r="1" fill="rgba(68.4504%,74.9844%,80.0137%,1)"/> - <circle cx="13" cy="16" r="1" fill="rgba(31.5969%,57.5708%,76.7575%,1)"/> - <circle cx="14" cy="16" r="1" fill="rgba(26.5156%,54.0719%,74.4396%,1)"/> - <circle cx="15" cy="16" r="1" fill="rgba(54.0719%,71.2963%,84.0253%,1)"/> - <circle cx="16" cy="16" r="1" fill="rgba(95.3033%,97.0657%,98.3658%,1)"/> - <circle cx="17" cy="16" r="1" fill="rgba(48.0766%,67.5502%,81.9394%,1)"/> - <circle cx="18" cy="16" r="1" fill="rgba(26.389%,53.9925%,74.3969%,1)"/> - <circle cx="19" cy="16" r="1" fill="rgba(34.6792%,59.5789%,77.966%,1)"/> - <circle cx="20" cy="16" r="1" fill="rgba(68.3268%,72.8725%,76.5118%,1)"/> - <circle cx="21" cy="16" r="1" fill="rgba(29.1096%,28.4154%,28.9357%,1)"/> - <circle cx="22" cy="16" r="1" fill="rgba(23.5828%,23.1815%,23.9872%,1)"/> - <circle cx="23" cy="16" r="1" fill="rgba(31.9966%,31.6136%,32.311%,1)"/> - <circle cx="24" cy="16" r="1" fill="rgba(86.0166%,86.3157%,86.7231%,1)"/> - <circle cx="25" cy="16" r="1" fill="rgba(52.0287%,70.3227%,83.8331%,1)"/> - <circle cx="26" cy="16" r="1" fill="rgba(26.5553%,54.1329%,74.5129%,1)"/> - <circle cx="27" cy="16" r="1" fill="rgba(29.2271%,55.1873%,74.4182%,1)"/> - <circle cx="28" cy="16" r="1" fill="rgba(55.0988%,60.5295%,65.417%,1)"/> - <circle cx="29" cy="16" r="1" fill="rgba(64.448%,62.4613%,62.1698%,1)"/> - <circle cx="30" cy="16" r="1" fill="rgba(63.6118%,62.0294%,62.0294%,1)"/> - <circle cx="31" cy="16" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="17" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="17" r="1" fill="rgba(64.123%,62.5635%,62.5635%,1)"/> - <circle cx="2" cy="17" r="1" fill="rgba(63.9216%,62.3468%,62.3438%,1)"/> - <circle cx="3" cy="17" r="1" fill="rgba(64.0146%,62.3728%,62.3194%,1)"/> - <circle cx="4" cy="17" r="1" fill="rgba(42.0233%,57.8302%,69.9641%,1)"/> - <circle cx="5" cy="17" r="1" fill="rgba(27.2145%,54.7723%,75.1202%,1)"/> - <circle cx="6" cy="17" r="1" fill="rgba(26.6819%,54.1756%,74.4976%,1)"/> - <circle cx="7" cy="17" r="1" fill="rgba(55.0256%,72.2835%,85.0233%,1)"/> - <circle cx="8" cy="17" r="1" fill="rgba(81.0712%,81.2039%,81.5656%,1)"/> - <circle cx="9" cy="17" r="1" fill="rgba(28.8075%,28.3894%,29.1081%,1)"/> - <circle cx="10" cy="17" r="1" fill="rgba(23.5996%,23.1998%,24.007%,1)"/> - <circle cx="11" cy="17" r="1" fill="rgba(32.6299%,31.7327%,32.0607%,1)"/> - <circle cx="12" cy="17" r="1" fill="rgba(64.9485%,72.7764%,78.764%,1)"/> - <circle cx="13" cy="17" r="1" fill="rgba(30.6035%,56.9512%,76.4126%,1)"/> - <circle cx="14" cy="17" r="1" fill="rgba(26.4805%,54.0505%,74.4274%,1)"/> - <circle cx="15" cy="17" r="1" fill="rgba(58.0621%,73.7911%,85.4124%,1)"/> - <circle cx="16" cy="17" r="1" fill="rgba(99.7101%,99.8199%,99.8993%,1)"/> - <circle cx="17" cy="17" r="1" fill="rgba(51.6182%,69.7658%,83.1693%,1)"/> - <circle cx="18" cy="17" r="1" fill="rgba(26.3325%,53.9574%,74.3771%,1)"/> - <circle cx="19" cy="17" r="1" fill="rgba(33.2082%,58.6603%,77.4563%,1)"/> - <circle cx="20" cy="17" r="1" fill="rgba(65.2277%,70.9148%,75.3964%,1)"/> - <circle cx="21" cy="17" r="1" fill="rgba(29.4209%,28.5924%,29.0135%,1)"/> - <circle cx="22" cy="17" r="1" fill="rgba(23.5859%,23.1876%,23.9948%,1)"/> - <circle cx="23" cy="17" r="1" fill="rgba(32.0897%,31.6487%,32.3049%,1)"/> - <circle cx="24" cy="17" r="1" fill="rgba(84.5853%,85.4032%,86.1967%,1)"/> - <circle cx="25" cy="17" r="1" fill="rgba(48.751%,68.275%,82.6947%,1)"/> - <circle cx="26" cy="17" r="1" fill="rgba(26.6743%,54.2061%,74.5541%,1)"/> - <circle cx="27" cy="17" r="1" fill="rgba(29.2271%,55.1873%,74.4182%,1)"/> - <circle cx="28" cy="17" r="1" fill="rgba(55.0988%,60.5295%,65.417%,1)"/> - <circle cx="29" cy="17" r="1" fill="rgba(64.448%,62.4613%,62.1698%,1)"/> - <circle cx="30" cy="17" r="1" fill="rgba(63.6118%,62.0294%,62.0294%,1)"/> - <circle cx="31" cy="17" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="18" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="18" r="1" fill="rgba(64.123%,62.5635%,62.5635%,1)"/> - <circle cx="2" cy="18" r="1" fill="rgba(63.9216%,62.3468%,62.3438%,1)"/> - <circle cx="3" cy="18" r="1" fill="rgba(64.0131%,62.3713%,62.3178%,1)"/> - <circle cx="4" cy="18" r="1" fill="rgba(42.0005%,57.8134%,69.9535%,1)"/> - <circle cx="5" cy="18" r="1" fill="rgba(27.2114%,54.7707%,75.1202%,1)"/> - <circle cx="6" cy="18" r="1" fill="rgba(27.4296%,54.6441%,74.7585%,1)"/> - <circle cx="7" cy="18" r="1" fill="rgba(34.4823%,59.1119%,77.3129%,1)"/> - <circle cx="8" cy="18" r="1" fill="rgba(77.525%,85.1392%,90.7973%,1)"/> - <circle cx="9" cy="18" r="1" fill="rgba(67.8889%,67.6158%,67.8828%,1)"/> - <circle cx="10" cy="18" r="1" fill="rgba(49.0242%,48.3696%,48.6351%,1)"/> - <circle cx="11" cy="18" r="1" fill="rgba(64.2329%,66.5797%,68.7312%,1)"/> - <circle cx="12" cy="18" r="1" fill="rgba(48.7907%,67.5486%,81.4298%,1)"/> - <circle cx="13" cy="18" r="1" fill="rgba(27.2511%,54.5693%,74.7585%,1)"/> - <circle cx="14" cy="18" r="1" fill="rgba(26.6056%,54.1283%,74.4717%,1)"/> - <circle cx="15" cy="18" r="1" fill="rgba(57.8286%,73.6461%,85.3315%,1)"/> - <circle cx="16" cy="18" r="1" fill="rgba(99.6002%,99.7513%,99.8596%,1)"/> - <circle cx="17" cy="18" r="1" fill="rgba(51.3695%,69.6101%,83.0838%,1)"/> - <circle cx="18" cy="18" r="1" fill="rgba(26.6011%,54.1253%,74.4701%,1)"/> - <circle cx="19" cy="18" r="1" fill="rgba(27.5975%,54.8135%,74.9279%,1)"/> - <circle cx="20" cy="18" r="1" fill="rgba(52.8313%,69.6086%,82.0432%,1)"/> - <circle cx="21" cy="18" r="1" fill="rgba(62.4216%,63.9307%,65.5222%,1)"/> - <circle cx="22" cy="18" r="1" fill="rgba(49.1325%,48.4596%,48.7083%,1)"/> - <circle cx="23" cy="18" r="1" fill="rgba(71.4397%,71.3771%,71.7372%,1)"/> - <circle cx="24" cy="18" r="1" fill="rgba(73.817%,83.2609%,90.2541%,1)"/> - <circle cx="25" cy="18" r="1" fill="rgba(31.8822%,57.4594%,76.3638%,1)"/> - <circle cx="26" cy="18" r="1" fill="rgba(27.4861%,54.7143%,74.8363%,1)"/> - <circle cx="27" cy="18" r="1" fill="rgba(29.2241%,55.1858%,74.4182%,1)"/> - <circle cx="28" cy="18" r="1" fill="rgba(55.0958%,60.528%,65.4139%,1)"/> - <circle cx="29" cy="18" r="1" fill="rgba(64.448%,62.4613%,62.1698%,1)"/> - <circle cx="30" cy="18" r="1" fill="rgba(63.6118%,62.0294%,62.0294%,1)"/> - <circle cx="31" cy="18" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="19" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="19" r="1" fill="rgba(64.1215%,62.5635%,62.565%,1)"/> - <circle cx="2" cy="19" r="1" fill="rgba(63.9582%,62.3545%,62.3316%,1)"/> - <circle cx="3" cy="19" r="1" fill="rgba(64.4831%,62.4811%,62.179%,1)"/> - <circle cx="4" cy="19" r="1" fill="rgba(42.4613%,58.0468%,70.0237%,1)"/> - <circle cx="5" cy="19" r="1" fill="rgba(26.7903%,54.5113%,74.9798%,1)"/> - <circle cx="6" cy="19" r="1" fill="rgba(27.8614%,54.9142%,74.9081%,1)"/> - <circle cx="7" cy="19" r="1" fill="rgba(27.0756%,54.4182%,74.6288%,1)"/> - <circle cx="8" cy="19" r="1" fill="rgba(34.725%,59.2706%,77.4121%,1)"/> - <circle cx="9" cy="19" r="1" fill="rgba(56.6278%,73.0358%,85.1606%,1)"/> - <circle cx="10" cy="19" r="1" fill="rgba(60.2289%,74.7097%,85.4292%,1)"/> - <circle cx="11" cy="19" r="1" fill="rgba(43.9994%,65.182%,80.8331%,1)"/> - <circle cx="12" cy="19" r="1" fill="rgba(28.2094%,55.1781%,75.1095%,1)"/> - <circle cx="13" cy="19" r="1" fill="rgba(27.7699%,54.8547%,74.873%,1)"/> - <circle cx="14" cy="19" r="1" fill="rgba(27.1183%,54.4488%,74.6502%,1)"/> - <circle cx="15" cy="19" r="1" fill="rgba(42.9984%,64.3748%,80.174%,1)"/> - <circle cx="16" cy="19" r="1" fill="rgba(72.4804%,82.8%,90.428%,1)"/> - <circle cx="17" cy="19" r="1" fill="rgba(39.1318%,61.9577%,78.8281%,1)"/> - <circle cx="18" cy="19" r="1" fill="rgba(27.2145%,54.5098%,74.6838%,1)"/> - <circle cx="19" cy="19" r="1" fill="rgba(27.7089%,54.8135%,74.8486%,1)"/> - <circle cx="20" cy="19" r="1" fill="rgba(28.8792%,55.6222%,75.3872%,1)"/> - <circle cx="21" cy="19" r="1" fill="rgba(46.3523%,66.6056%,81.5702%,1)"/> - <circle cx="22" cy="19" r="1" fill="rgba(60.8972%,75.1293%,85.6657%,1)"/> - <circle cx="23" cy="19" r="1" fill="rgba(54.7982%,71.9402%,84.6021%,1)"/> - <circle cx="24" cy="19" r="1" fill="rgba(32.8054%,58.0468%,76.701%,1)"/> - <circle cx="25" cy="19" r="1" fill="rgba(27.1824%,54.4869%,74.6685%,1)"/> - <circle cx="26" cy="19" r="1" fill="rgba(27.7592%,54.8852%,74.9325%,1)"/> - <circle cx="27" cy="19" r="1" fill="rgba(28.7343%,54.8745%,74.2397%,1)"/> - <circle cx="28" cy="19" r="1" fill="rgba(55.2453%,60.4791%,65.2308%,1)"/> - <circle cx="29" cy="19" r="1" fill="rgba(64.6891%,62.5116%,62.0874%,1)"/> - <circle cx="30" cy="19" r="1" fill="rgba(63.6027%,62.0279%,62.0325%,1)"/> - <circle cx="31" cy="19" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="20" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="20" r="1" fill="rgba(64.1642%,62.5727%,62.5498%,1)"/> - <circle cx="2" cy="20" r="1" fill="rgba(63.093%,62.1225%,62.5422%,1)"/> - <circle cx="3" cy="20" r="1" fill="rgba(57.0809%,61.8112%,66.1784%,1)"/> - <circle cx="4" cy="20" r="1" fill="rgba(67.9057%,76.4706%,83.0671%,1)"/> - <circle cx="5" cy="20" r="1" fill="rgba(45.304%,65.9937%,81.2726%,1)"/> - <circle cx="6" cy="20" r="1" fill="rgba(27.2465%,54.5296%,74.6944%,1)"/> - <circle cx="7" cy="20" r="1" fill="rgba(32.43%,57.7691%,76.4965%,1)"/> - <circle cx="8" cy="20" r="1" fill="rgba(32.1859%,57.615%,76.4126%,1)"/> - <circle cx="9" cy="20" r="1" fill="rgba(27.4174%,54.6426%,74.7646%,1)"/> - <circle cx="10" cy="20" r="1" fill="rgba(25.893%,53.7118%,74.2733%,1)"/> - <circle cx="11" cy="20" r="1" fill="rgba(26.7903%,54.2489%,74.5434%,1)"/> - <circle cx="12" cy="20" r="1" fill="rgba(27.8187%,54.8867%,74.8928%,1)"/> - <circle cx="13" cy="20" r="1" fill="rgba(27.686%,54.8028%,74.847%,1)"/> - <circle cx="14" cy="20" r="1" fill="rgba(27.0603%,54.4137%,74.6304%,1)"/> - <circle cx="15" cy="20" r="1" fill="rgba(26.8269%,54.2672%,74.5495%,1)"/> - <circle cx="16" cy="20" r="1" fill="rgba(27.4266%,54.641%,74.757%,1)"/> - <circle cx="17" cy="20" r="1" fill="rgba(26.804%,54.2519%,74.5403%,1)"/> - <circle cx="18" cy="20" r="1" fill="rgba(27.129%,54.4549%,74.6532%,1)"/> - <circle cx="19" cy="20" r="1" fill="rgba(27.7592%,54.8501%,74.873%,1)"/> - <circle cx="20" cy="20" r="1" fill="rgba(27.779%,54.8608%,74.8791%,1)"/> - <circle cx="21" cy="20" r="1" fill="rgba(26.5782%,54.1192%,74.4732%,1)"/> - <circle cx="22" cy="20" r="1" fill="rgba(25.9709%,53.7606%,74.3008%,1)"/> - <circle cx="23" cy="20" r="1" fill="rgba(27.8767%,54.9279%,74.9218%,1)"/> - <circle cx="24" cy="20" r="1" fill="rgba(32.8969%,58.0606%,76.6598%,1)"/> - <circle cx="25" cy="20" r="1" fill="rgba(31.519%,57.2%,76.1807%,1)"/> - <circle cx="26" cy="20" r="1" fill="rgba(27.509%,54.7097%,74.8135%,1)"/> - <circle cx="27" cy="20" r="1" fill="rgba(50.8232%,69.0135%,82.4765%,1)"/> - <circle cx="28" cy="20" r="1" fill="rgba(64.0543%,69.2531%,73.7316%,1)"/> - <circle cx="29" cy="20" r="1" fill="rgba(59.7055%,61.21%,63.3661%,1)"/> - <circle cx="30" cy="20" r="1" fill="rgba(63.7522%,62.0584%,61.9806%,1)"/> - <circle cx="31" cy="20" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="21" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="21" r="1" fill="rgba(64.271%,62.594%,62.5132%,1)"/> - <circle cx="2" cy="21" r="1" fill="rgba(61.5045%,61.8311%,63.1556%,1)"/> - <circle cx="3" cy="21" r="1" fill="rgba(34.9767%,56.2493%,72.2118%,1)"/> - <circle cx="4" cy="21" r="1" fill="rgba(54.0078%,71.3634%,84.1764%,1)"/> - <circle cx="5" cy="21" r="1" fill="rgba(61.9867%,76.2509%,86.7842%,1)"/> - <circle cx="6" cy="21" r="1" fill="rgba(26.5736%,54.1085%,74.461%,1)"/> - <circle cx="7" cy="21" r="1" fill="rgba(66.6575%,79.1623%,88.4047%,1)"/> - <circle cx="8" cy="21" r="1" fill="rgba(74.4793%,84.0497%,91.1238%,1)"/> - <circle cx="9" cy="21" r="1" fill="rgba(67.6509%,79.7833%,88.7495%,1)"/> - <circle cx="10" cy="21" r="1" fill="rgba(58.3703%,73.9818%,85.5207%,1)"/> - <circle cx="11" cy="21" r="1" fill="rgba(32.6253%,57.8912%,76.5652%,1)"/> - <circle cx="12" cy="21" r="1" fill="rgba(27.3793%,54.612%,74.7402%,1)"/> - <circle cx="13" cy="21" r="1" fill="rgba(30.3532%,56.4706%,75.7748%,1)"/> - <circle cx="14" cy="21" r="1" fill="rgba(40.8423%,63.0259%,79.4232%,1)"/> - <circle cx="15" cy="21" r="1" fill="rgba(42.385%,63.9902%,79.9603%,1)"/> - <circle cx="16" cy="21" r="1" fill="rgba(42.1469%,63.8422%,79.8764%,1)"/> - <circle cx="17" cy="21" r="1" fill="rgba(42.4598%,64.0375%,79.9863%,1)"/> - <circle cx="18" cy="21" r="1" fill="rgba(39.7086%,62.3178%,79.0295%,1)"/> - <circle cx="19" cy="21" r="1" fill="rgba(29.218%,55.761%,75.3796%,1)"/> - <circle cx="20" cy="21" r="1" fill="rgba(27.2969%,54.5602%,74.7127%,1)"/> - <circle cx="21" cy="21" r="1" fill="rgba(35.761%,59.852%,77.6562%,1)"/> - <circle cx="22" cy="21" r="1" fill="rgba(61.0193%,75.6374%,86.4424%,1)"/> - <circle cx="23" cy="21" r="1" fill="rgba(68.2017%,80.1282%,88.9403%,1)"/> - <circle cx="24" cy="21" r="1" fill="rgba(76.3149%,85.1957%,91.7617%,1)"/> - <circle cx="25" cy="21" r="1" fill="rgba(59.7772%,74.8562%,86.0075%,1)"/> - <circle cx="26" cy="21" r="1" fill="rgba(26.5766%,54.1085%,74.4594%,1)"/> - <circle cx="27" cy="21" r="1" fill="rgba(68.2673%,80.1755%,88.9784%,1)"/> - <circle cx="28" cy="21" r="1" fill="rgba(45.6413%,65.6764%,80.5112%,1)"/> - <circle cx="29" cy="21" r="1" fill="rgba(47.097%,58.5321%,67.631%,1)"/> - <circle cx="30" cy="21" r="1" fill="rgba(64.155%,62.1424%,61.8402%,1)"/> - <circle cx="31" cy="21" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="22" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="22" r="1" fill="rgba(64.21%,62.5818%,62.533%,1)"/> - <circle cx="2" cy="22" r="1" fill="rgba(62.5422%,62.063%,62.826%,1)"/> - <circle cx="3" cy="22" r="1" fill="rgba(35.8831%,56.1242%,71.3771%,1)"/> - <circle cx="4" cy="22" r="1" fill="rgba(44.6555%,65.6519%,81.146%,1)"/> - <circle cx="5" cy="22" r="1" fill="rgba(75.1675%,84.48%,91.3588%,1)"/> - <circle cx="6" cy="22" r="1" fill="rgba(48.484%,67.8019%,82.0813%,1)"/> - <circle cx="7" cy="22" r="1" fill="rgba(72.578%,82.8611%,90.4646%,1)"/> - <circle cx="8" cy="22" r="1" fill="rgba(44.5136%,65.3193%,80.7004%,1)"/> - <circle cx="9" cy="22" r="1" fill="rgba(41.0224%,63.1403%,79.4858%,1)"/> - <circle cx="10" cy="22" r="1" fill="rgba(73.7133%,83.5752%,90.8568%,1)"/> - <circle cx="11" cy="22" r="1" fill="rgba(41.5625%,63.4745%,79.675%,1)"/> - <circle cx="12" cy="22" r="1" fill="rgba(25.2064%,53.254%,73.9849%,1)"/> - <circle cx="13" cy="22" r="1" fill="rgba(43.5981%,64.7486%,80.3815%,1)"/> - <circle cx="14" cy="22" r="1" fill="rgba(78.5977%,86.6255%,92.5551%,1)"/> - <circle cx="15" cy="22" r="1" fill="rgba(66.3554%,78.9731%,88.2963%,1)"/> - <circle cx="16" cy="22" r="1" fill="rgba(66.5187%,79.0707%,88.3558%,1)"/> - <circle cx="17" cy="22" r="1" fill="rgba(67.1595%,79.4766%,88.5756%,1)"/> - <circle cx="18" cy="22" r="1" fill="rgba(78.0682%,86.2959%,92.3705%,1)"/> - <circle cx="19" cy="22" r="1" fill="rgba(37.1588%,60.7263%,78.1415%,1)"/> - <circle cx="20" cy="22" r="1" fill="rgba(25.1759%,53.2341%,73.9742%,1)"/> - <circle cx="21" cy="22" r="1" fill="rgba(49.1432%,68.22%,82.3102%,1)"/> - <circle cx="22" cy="22" r="1" fill="rgba(69.9687%,81.2329%,89.5521%,1)"/> - <circle cx="23" cy="22" r="1" fill="rgba(38.5885%,61.6175%,78.6389%,1)"/> - <circle cx="24" cy="22" r="1" fill="rgba(50.2449%,68.8975%,82.6932%,1)"/> - <circle cx="25" cy="22" r="1" fill="rgba(69.4423%,80.8927%,89.3675%,1)"/> - <circle cx="26" cy="22" r="1" fill="rgba(50.0496%,68.7816%,82.6246%,1)"/> - <circle cx="27" cy="22" r="1" fill="rgba(76.3958%,85.2506%,91.7967%,1)"/> - <circle cx="28" cy="22" r="1" fill="rgba(38.5595%,61.6419%,78.7015%,1)"/> - <circle cx="29" cy="22" r="1" fill="rgba(49.2988%,59.0555%,66.978%,1)"/> - <circle cx="30" cy="22" r="1" fill="rgba(64.21%,62.153%,61.8219%,1)"/> - <circle cx="31" cy="22" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="23" r="1" fill="rgba(83.9948%,83.299%,83.299%,1)"/> - <circle cx="1" cy="23" r="1" fill="rgba(64.1291%,62.565%,62.562%,1)"/> - <circle cx="2" cy="23" r="1" fill="rgba(64.2359%,62.4125%,62.2339%,1)"/> - <circle cx="3" cy="23" r="1" fill="rgba(46.6758%,58.7213%,68.2338%,1)"/> - <circle cx="4" cy="23" r="1" fill="rgba(30.248%,56.5072%,75.9091%,1)"/> - <circle cx="5" cy="23" r="1" fill="rgba(47.8492%,67.4159%,81.8769%,1)"/> - <circle cx="6" cy="23" r="1" fill="rgba(65.1484%,78.2177%,87.8782%,1)"/> - <circle cx="7" cy="23" r="1" fill="rgba(74.4488%,84.0299%,91.1131%,1)"/> - <circle cx="8" cy="23" r="1" fill="rgba(35.2712%,59.5438%,77.4853%,1)"/> - <circle cx="9" cy="23" r="1" fill="rgba(26.4393%,54.0261%,74.4137%,1)"/> - <circle cx="10" cy="23" r="1" fill="rgba(66.9627%,79.3561%,88.5069%,1)"/> - <circle cx="11" cy="23" r="1" fill="rgba(59.0951%,74.432%,85.774%,1)"/> - <circle cx="12" cy="23" r="1" fill="rgba(40.4486%,62.7802%,79.2859%,1)"/> - <circle cx="13" cy="23" r="1" fill="rgba(53.5042%,70.9407%,83.827%,1)"/> - <circle cx="14" cy="23" r="1" fill="rgba(63.6011%,77.2549%,87.3396%,1)"/> - <circle cx="15" cy="23" r="1" fill="rgba(27.2862%,54.5541%,74.7082%,1)"/> - <circle cx="16" cy="23" r="1" fill="rgba(27.9545%,54.9706%,74.9401%,1)"/> - <circle cx="17" cy="23" r="1" fill="rgba(28.9006%,55.5627%,75.2682%,1)"/> - <circle cx="18" cy="23" r="1" fill="rgba(69.0059%,80.6332%,89.2164%,1)"/> - <circle cx="19" cy="23" r="1" fill="rgba(47.8874%,67.4327%,81.8723%,1)"/> - <circle cx="20" cy="23" r="1" fill="rgba(41.5381%,63.4607%,79.6658%,1)"/> - <circle cx="21" cy="23" r="1" fill="rgba(64.6494%,77.9095%,87.7043%,1)"/> - <circle cx="22" cy="23" r="1" fill="rgba(59.7314%,74.8333%,85.9907%,1)"/> - <circle cx="23" cy="23" r="1" fill="rgba(25.2415%,53.2753%,73.9971%,1)"/> - <circle cx="24" cy="23" r="1" fill="rgba(40.8011%,62.9984%,79.4079%,1)"/> - <circle cx="25" cy="23" r="1" fill="rgba(76.0235%,85.0126%,91.6594%,1)"/> - <circle cx="26" cy="23" r="1" fill="rgba(62.6383%,76.6476%,87.0024%,1)"/> - <circle cx="27" cy="23" r="1" fill="rgba(44.5518%,65.4826%,80.9415%,1)"/> - <circle cx="28" cy="23" r="1" fill="rgba(33.3211%,56.6079%,73.9513%,1)"/> - <circle cx="29" cy="23" r="1" fill="rgba(58.1231%,61.1139%,64.3%,1)"/> - <circle cx="30" cy="23" r="1" fill="rgba(63.9521%,62.0996%,61.912%,1)"/> - <circle cx="31" cy="23" r="1" fill="rgba(77.2137%,76.2234%,76.2234%,1)"/> - <circle cx="0" cy="24" r="1" fill="rgba(83.9872%,83.2914%,83.2914%,1)"/> - <circle cx="1" cy="24" r="1" fill="rgba(64.1215%,62.562%,62.562%,1)"/> - <circle cx="2" cy="24" r="1" fill="rgba(64.1566%,62.3957%,62.2614%,1)"/> - <circle cx="3" cy="24" r="1" fill="rgba(60.2472%,61.5991%,63.6393%,1)"/> - <circle cx="4" cy="24" r="1" fill="rgba(36.0327%,56.5194%,71.9295%,1)"/> - <circle cx="5" cy="24" r="1" fill="rgba(26.215%,54.1253%,74.7341%,1)"/> - <circle cx="6" cy="24" r="1" fill="rgba(27.7485%,54.8486%,74.8791%,1)"/> - <circle cx="7" cy="24" r="1" fill="rgba(30.9468%,56.8414%,75.9808%,1)"/> - <circle cx="8" cy="24" r="1" fill="rgba(28.3513%,55.2193%,75.079%,1)"/> - <circle cx="9" cy="24" r="1" fill="rgba(27.5288%,54.7066%,74.7936%,1)"/> - <circle cx="10" cy="24" r="1" fill="rgba(44.3702%,65.2323%,80.65%,1)"/> - <circle cx="11" cy="24" r="1" fill="rgba(62.4582%,76.5362%,86.9413%,1)"/> - <circle cx="12" cy="24" r="1" fill="rgba(66.9718%,79.3576%,88.513%,1)"/> - <circle cx="13" cy="24" r="1" fill="rgba(74.2168%,83.8849%,91.0323%,1)"/> - <circle cx="14" cy="24" r="1" fill="rgba(56.2234%,72.6421%,84.7745%,1)"/> - <circle cx="15" cy="24" r="1" fill="rgba(27.1443%,54.4656%,74.6593%,1)"/> - <circle cx="16" cy="24" r="1" fill="rgba(27.8035%,54.8775%,74.8882%,1)"/> - <circle cx="17" cy="24" r="1" fill="rgba(28.1498%,55.0942%,75.0088%,1)"/> - <circle cx="18" cy="24" r="1" fill="rgba(62.649%,76.6583%,87.0069%,1)"/> - <circle cx="19" cy="24" r="1" fill="rgba(72.7901%,82.9953%,90.5348%,1)"/> - <circle cx="20" cy="24" r="1" fill="rgba(66.4179%,79.0112%,88.3192%,1)"/> - <circle cx="21" cy="24" r="1" fill="rgba(61.2802%,75.8007%,86.5324%,1)"/> - <circle cx="22" cy="24" r="1" fill="rgba(40.3021%,62.6886%,79.2355%,1)"/> - <circle cx="23" cy="24" r="1" fill="rgba(27.2923%,54.5586%,74.7112%,1)"/> - <circle cx="24" cy="24" r="1" fill="rgba(28.7663%,55.4788%,75.2224%,1)"/> - <circle cx="25" cy="24" r="1" fill="rgba(30.7973%,56.7468%,75.9258%,1)"/> - <circle cx="26" cy="24" r="1" fill="rgba(27.1748%,54.5556%,74.789%,1)"/> - <circle cx="27" cy="24" r="1" fill="rgba(27.3259%,54.3984%,74.4213%,1)"/> - <circle cx="28" cy="24" r="1" fill="rgba(47.2236%,58.8647%,68.0949%,1)"/> - <circle cx="29" cy="24" r="1" fill="rgba(63.946%,62.3606%,62.3499%,1)"/> - <circle cx="30" cy="24" r="1" fill="rgba(63.6316%,62.034%,62.0218%,1)"/> - <circle cx="31" cy="24" r="1" fill="rgba(77.2045%,76.2142%,76.2142%,1)"/> - <circle cx="0" cy="25" r="1" fill="rgba(84.0635%,83.3707%,83.3707%,1)"/> - <circle cx="1" cy="25" r="1" fill="rgba(64.1276%,62.5681%,62.5681%,1)"/> - <circle cx="2" cy="25" r="1" fill="rgba(63.9094%,62.3453%,62.3484%,1)"/> - <circle cx="3" cy="25" r="1" fill="rgba(64.2802%,62.4262%,62.2278%,1)"/> - <circle cx="4" cy="25" r="1" fill="rgba(57.2259%,60.9705%,64.6799%,1)"/> - <circle cx="5" cy="25" r="1" fill="rgba(35.6832%,56.5209%,72.1752%,1)"/> - <circle cx="6" cy="25" r="1" fill="rgba(27.3869%,54.7967%,75.0423%,1)"/> - <circle cx="7" cy="25" r="1" fill="rgba(27.4846%,54.7509%,74.8974%,1)"/> - <circle cx="8" cy="25" r="1" fill="rgba(27.8141%,54.8821%,74.8898%,1)"/> - <circle cx="9" cy="25" r="1" fill="rgba(27.8508%,54.9065%,74.905%,1)"/> - <circle cx="10" cy="25" r="1" fill="rgba(27.1275%,54.4549%,74.6532%,1)"/> - <circle cx="11" cy="25" r="1" fill="rgba(26.978%,54.3618%,74.6014%,1)"/> - <circle cx="12" cy="25" r="1" fill="rgba(28.2536%,55.1583%,75.0439%,1)"/> - <circle cx="13" cy="25" r="1" fill="rgba(30.5257%,56.5789%,75.8358%,1)"/> - <circle cx="14" cy="25" r="1" fill="rgba(29.4621%,55.9136%,75.465%,1)"/> - <circle cx="15" cy="25" r="1" fill="rgba(27.7806%,54.8638%,74.8806%,1)"/> - <circle cx="16" cy="25" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="25" r="1" fill="rgba(27.8141%,54.8836%,74.8913%,1)"/> - <circle cx="18" cy="25" r="1" fill="rgba(29.9138%,56.1959%,75.6222%,1)"/> - <circle cx="19" cy="25" r="1" fill="rgba(30.2266%,56.3912%,75.7305%,1)"/> - <circle cx="20" cy="25" r="1" fill="rgba(27.9973%,54.9981%,74.9554%,1)"/> - <circle cx="21" cy="25" r="1" fill="rgba(26.8833%,54.3023%,74.5678%,1)"/> - <circle cx="22" cy="25" r="1" fill="rgba(27.2801%,54.5495%,74.7066%,1)"/> - <circle cx="23" cy="25" r="1" fill="rgba(27.8676%,54.9172%,74.9096%,1)"/> - <circle cx="24" cy="25" r="1" fill="rgba(27.7668%,54.8623%,74.8882%,1)"/> - <circle cx="25" cy="25" r="1" fill="rgba(27.248%,54.7066%,74.9874%,1)"/> - <circle cx="26" cy="25" r="1" fill="rgba(28.8746%,55.111%,74.5357%,1)"/> - <circle cx="27" cy="25" r="1" fill="rgba(44.7517%,58.3932%,69.0196%,1)"/> - <circle cx="28" cy="25" r="1" fill="rgba(62.6108%,62.0829%,62.8092%,1)"/> - <circle cx="29" cy="25" r="1" fill="rgba(64.0589%,62.3819%,62.3056%,1)"/> - <circle cx="30" cy="25" r="1" fill="rgba(63.6088%,62.0279%,62.0294%,1)"/> - <circle cx="31" cy="25" r="1" fill="rgba(77.2839%,76.2951%,76.2951%,1)"/> - <circle cx="0" cy="26" r="1" fill="rgba(86.4393%,85.8503%,85.8503%,1)"/> - <circle cx="1" cy="26" r="1" fill="rgba(64.5747%,63.035%,63.035%,1)"/> - <circle cx="2" cy="26" r="1" fill="rgba(63.8941%,62.3239%,62.3239%,1)"/> - <circle cx="3" cy="26" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="4" cy="26" r="1" fill="rgba(64.2969%,62.4308%,62.2232%,1)"/> - <circle cx="5" cy="26" r="1" fill="rgba(59.4583%,61.4313%,63.9048%,1)"/> - <circle cx="6" cy="26" r="1" fill="rgba(42.5086%,57.9309%,69.8024%,1)"/> - <circle cx="7" cy="26" r="1" fill="rgba(30.0191%,55.3521%,74.1451%,1)"/> - <circle cx="8" cy="26" r="1" fill="rgba(27.2862%,54.7875%,75.0958%,1)"/> - <circle cx="9" cy="26" r="1" fill="rgba(27.5425%,54.8394%,75.0057%,1)"/> - <circle cx="10" cy="26" r="1" fill="rgba(27.805%,54.8943%,74.9157%,1)"/> - <circle cx="11" cy="26" r="1" fill="rgba(27.8447%,54.902%,74.902%,1)"/> - <circle cx="12" cy="26" r="1" fill="rgba(27.8187%,54.8867%,74.8928%,1)"/> - <circle cx="13" cy="26" r="1" fill="rgba(27.7058%,54.8165%,74.8547%,1)"/> - <circle cx="14" cy="26" r="1" fill="rgba(27.744%,54.8394%,74.8669%,1)"/> - <circle cx="15" cy="26" r="1" fill="rgba(27.8462%,54.905%,74.9035%,1)"/> - <circle cx="16" cy="26" r="1" fill="rgba(71,140,191,1)"/> - <circle cx="17" cy="26" r="1" fill="rgba(27.8447%,54.9035%,74.902%,1)"/> - <circle cx="18" cy="26" r="1" fill="rgba(27.7195%,54.8241%,74.8592%,1)"/> - <circle cx="19" cy="26" r="1" fill="rgba(27.7256%,54.8287%,74.8608%,1)"/> - <circle cx="20" cy="26" r="1" fill="rgba(27.8264%,54.8913%,74.8959%,1)"/> - <circle cx="21" cy="26" r="1" fill="rgba(27.8401%,54.902%,74.9035%,1)"/> - <circle cx="22" cy="26" r="1" fill="rgba(27.7287%,54.8791%,74.9416%,1)"/> - <circle cx="23" cy="26" r="1" fill="rgba(27.3655%,54.8028%,75.0683%,1)"/> - <circle cx="24" cy="26" r="1" fill="rgba(27.7195%,54.876%,74.9447%,1)"/> - <circle cx="25" cy="26" r="1" fill="rgba(33.9117%,56.1547%,72.7916%,1)"/> - <circle cx="26" cy="26" r="1" fill="rgba(50.4295%,59.5666%,67.0466%,1)"/> - <circle cx="27" cy="26" r="1" fill="rgba(63.1159%,62.1866%,62.6337%,1)"/> - <circle cx="28" cy="26" r="1" fill="rgba(64.1016%,62.3896%,62.2904%,1)"/> - <circle cx="29" cy="26" r="1" fill="rgba(63.917%,62.3529%,62.356%,1)"/> - <circle cx="30" cy="26" r="1" fill="rgba(63.7232%,62.1469%,62.1469%,1)"/> - <circle cx="31" cy="26" r="1" fill="rgba(79.8306%,78.9532%,78.9532%,1)"/> - <circle cx="0" cy="27" r="1" fill="rgba(93.1426%,92.845%,92.845%,1)"/> - <circle cx="1" cy="27" r="1" fill="rgba(67.5502%,66.1402%,66.1402%,1)"/> - <circle cx="2" cy="27" r="1" fill="rgba(63.682%,62.1027%,62.1027%,1)"/> - <circle cx="3" cy="27" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="4" cy="27" r="1" fill="rgba(63.917%,62.3514%,62.3545%,1)"/> - <circle cx="5" cy="27" r="1" fill="rgba(64.2283%,62.4155%,62.2461%,1)"/> - <circle cx="6" cy="27" r="1" fill="rgba(63.3555%,62.237%,62.5498%,1)"/> - <circle cx="7" cy="27" r="1" fill="rgba(55.0591%,60.5234%,65.4368%,1)"/> - <circle cx="8" cy="27" r="1" fill="rgba(41.9715%,57.8195%,69.9886%,1)"/> - <circle cx="9" cy="27" r="1" fill="rgba(32.4514%,55.8541%,73.2998%,1)"/> - <circle cx="10" cy="27" r="1" fill="rgba(28.3421%,55.0057%,74.7295%,1)"/> - <circle cx="11" cy="27" r="1" fill="rgba(27.3014%,54.7906%,75.0896%,1)"/> - <circle cx="12" cy="27" r="1" fill="rgba(27.2587%,54.7814%,75.1049%,1)"/> - <circle cx="13" cy="27" r="1" fill="rgba(27.4083%,54.8119%,75.053%,1)"/> - <circle cx="14" cy="27" r="1" fill="rgba(27.5349%,54.8379%,75.0088%,1)"/> - <circle cx="15" cy="27" r="1" fill="rgba(27.6066%,54.8531%,74.9844%,1)"/> - <circle cx="16" cy="27" r="1" fill="rgba(27.6219%,54.8562%,74.9783%,1)"/> - <circle cx="17" cy="27" r="1" fill="rgba(27.5822%,54.8486%,74.992%,1)"/> - <circle cx="18" cy="27" r="1" fill="rgba(27.4876%,54.8287%,75.0256%,1)"/> - <circle cx="19" cy="27" r="1" fill="rgba(27.3411%,54.7982%,75.0759%,1)"/> - <circle cx="20" cy="27" r="1" fill="rgba(27.2297%,54.7753%,75.1156%,1)"/> - <circle cx="21" cy="27" r="1" fill="rgba(27.5364%,54.8379%,75.0088%,1)"/> - <circle cx="22" cy="27" r="1" fill="rgba(29.5689%,55.259%,74.3023%,1)"/> - <circle cx="23" cy="27" r="1" fill="rgba(35.8053%,56.5454%,72.1309%,1)"/> - <circle cx="24" cy="27" r="1" fill="rgba(47.5334%,58.9685%,68.0522%,1)"/> - <circle cx="25" cy="27" r="1" fill="rgba(59.6811%,61.4771%,63.827%,1)"/> - <circle cx="26" cy="27" r="1" fill="rgba(64.2832%,62.4277%,62.2278%,1)"/> - <circle cx="27" cy="27" r="1" fill="rgba(64.0162%,62.3728%,62.3209%,1)"/> - <circle cx="28" cy="27" r="1" fill="rgba(63.917%,62.3514%,62.3545%,1)"/> - <circle cx="29" cy="27" r="1" fill="rgba(63.8437%,62.2721%,62.2721%,1)"/> - <circle cx="30" cy="27" r="1" fill="rgba(65.1453%,63.6301%,63.6301%,1)"/> - <circle cx="31" cy="27" r="1" fill="rgba(87.8477%,87.3198%,87.3198%,1)"/> - <circle cx="0" cy="28" r="1" fill="rgba(99.3515%,99.324%,99.324%,1)"/> - <circle cx="1" cy="28" r="1" fill="rgba(78.4466%,77.5082%,77.5082%,1)"/> - <circle cx="2" cy="28" r="1" fill="rgba(63.386%,61.7929%,61.7929%,1)"/> - <circle cx="3" cy="28" r="1" fill="rgba(63.9063%,62.3377%,62.3377%,1)"/> - <circle cx="4" cy="28" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="5" cy="28" r="1" fill="rgba(63.9185%,62.3529%,62.3545%,1)"/> - <circle cx="6" cy="28" r="1" fill="rgba(63.9811%,62.3651%,62.3331%,1)"/> - <circle cx="7" cy="28" r="1" fill="rgba(64.3931%,62.4506%,62.1881%,1)"/> - <circle cx="8" cy="28" r="1" fill="rgba(63.682%,62.3041%,62.4369%,1)"/> - <circle cx="9" cy="28" r="1" fill="rgba(59.2889%,61.3977%,63.9658%,1)"/> - <circle cx="10" cy="28" r="1" fill="rgba(51.9249%,59.8764%,66.5263%,1)"/> - <circle cx="11" cy="28" r="1" fill="rgba(44.4251%,58.3276%,69.1341%,1)"/> - <circle cx="12" cy="28" r="1" fill="rgba(38.584%,57.1191%,71.1666%,1)"/> - <circle cx="13" cy="28" r="1" fill="rgba(34.7936%,56.3363%,72.4849%,1)"/> - <circle cx="14" cy="28" r="1" fill="rgba(32.6085%,55.8862%,73.2448%,1)"/> - <circle cx="15" cy="28" r="1" fill="rgba(31.5084%,55.6588%,73.6263%,1)"/> - <circle cx="16" cy="28" r="1" fill="rgba(31.2734%,55.6115%,73.7072%,1)"/> - <circle cx="17" cy="28" r="1" fill="rgba(31.8685%,55.7336%,73.5027%,1)"/> - <circle cx="18" cy="28" r="1" fill="rgba(33.3806%,56.0449%,72.9763%,1)"/> - <circle cx="19" cy="28" r="1" fill="rgba(36.1852%,56.6247%,72.0012%,1)"/> - <circle cx="20" cy="28" r="1" fill="rgba(40.8255%,57.583%,70.3868%,1)"/> - <circle cx="21" cy="28" r="1" fill="rgba(47.5044%,58.9624%,68.0644%,1)"/> - <circle cx="22" cy="28" r="1" fill="rgba(55.259%,60.5646%,65.3666%,1)"/> - <circle cx="23" cy="28" r="1" fill="rgba(61.6739%,61.8891%,63.1342%,1)"/> - <circle cx="24" cy="28" r="1" fill="rgba(64.3229%,62.4353%,62.2126%,1)"/> - <circle cx="25" cy="28" r="1" fill="rgba(64.1978%,62.4094%,62.2568%,1)"/> - <circle cx="26" cy="28" r="1" fill="rgba(63.9231%,62.3529%,62.3529%,1)"/> - <circle cx="27" cy="28" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="28" cy="28" r="1" fill="rgba(63.9261%,62.3575%,62.3575%,1)"/> - <circle cx="29" cy="28" r="1" fill="rgba(63.3204%,61.7258%,61.7258%,1)"/> - <circle cx="30" cy="28" r="1" fill="rgba(73.4371%,72.282%,72.282%,1)"/> - <circle cx="31" cy="28" r="1" fill="rgba(97.3617%,97.2473%,97.2473%,1)"/> - <circle cx="0" cy="29" r="1" fill="white"/> - <circle cx="1" cy="29" r="1" fill="rgba(95.0423%,94.8272%,94.8272%,1)"/> - <circle cx="2" cy="29" r="1" fill="rgba(71.9661%,70.7469%,70.7469%,1)"/> - <circle cx="3" cy="29" r="1" fill="rgba(63.3356%,61.7426%,61.7426%,1)"/> - <circle cx="4" cy="29" r="1" fill="rgba(63.772%,62.1958%,62.1958%,1)"/> - <circle cx="5" cy="29" r="1" fill="rgba(63.92%,62.3514%,62.3514%,1)"/> - <circle cx="6" cy="29" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="7" cy="29" r="1" fill="rgba(63.92%,62.3529%,62.3529%,1)"/> - <circle cx="8" cy="29" r="1" fill="rgba(63.9521%,62.359%,62.3423%,1)"/> - <circle cx="9" cy="29" r="1" fill="rgba(64.2145%,62.414%,62.2507%,1)"/> - <circle cx="10" cy="29" r="1" fill="rgba(64.5045%,62.4735%,62.15%,1)"/> - <circle cx="11" cy="29" r="1" fill="rgba(64.2451%,62.4201%,62.24%,1)"/> - <circle cx="12" cy="29" r="1" fill="rgba(63.1647%,62.1973%,62.6169%,1)"/> - <circle cx="13" cy="29" r="1" fill="rgba(61.5335%,61.8601%,63.183%,1)"/> - <circle cx="14" cy="29" r="1" fill="rgba(59.9359%,61.529%,63.74%,1)"/> - <circle cx="15" cy="29" r="1" fill="rgba(58.8159%,61.2985%,64.1291%,1)"/> - <circle cx="16" cy="29" r="1" fill="rgba(58.5397%,61.2421%,64.2237%,1)"/> - <circle cx="17" cy="29" r="1" fill="rgba(59.2111%,61.3794%,63.9918%,1)"/> - <circle cx="18" cy="29" r="1" fill="rgba(60.5798%,61.6632%,63.5157%,1)"/> - <circle cx="19" cy="29" r="1" fill="rgba(62.2614%,62.0096%,62.9313%,1)"/> - <circle cx="20" cy="29" r="1" fill="rgba(63.7232%,62.3117%,62.4216%,1)"/> - <circle cx="21" cy="29" r="1" fill="rgba(64.4526%,62.4628%,62.1683%,1)"/> - <circle cx="22" cy="29" r="1" fill="rgba(64.416%,62.4552%,62.1805%,1)"/> - <circle cx="23" cy="29" r="1" fill="rgba(64.0696%,62.3835%,62.3011%,1)"/> - <circle cx="24" cy="29" r="1" fill="rgba(63.9231%,62.3529%,62.3529%,1)"/> - <circle cx="25" cy="29" r="1" fill="rgba(163,159,159,1)"/> - <circle cx="26" cy="29" r="1" fill="rgba(63.9231%,62.3545%,62.3545%,1)"/> - <circle cx="27" cy="29" r="1" fill="rgba(63.8315%,62.2599%,62.2599%,1)"/> - <circle cx="28" cy="29" r="1" fill="rgba(63.3158%,61.7197%,61.7197%,1)"/> - <circle cx="29" cy="29" r="1" fill="rgba(68.6366%,67.274%,67.274%,1)"/> - <circle cx="30" cy="29" r="1" fill="rgba(91.5679%,91.2016%,91.2016%,1)"/> - <circle cx="31" cy="29" r="1" fill="white"/> - <circle cx="0" cy="30" r="1" fill="white"/> - <circle cx="1" cy="30" r="1" fill="white"/> - <circle cx="2" cy="30" r="1" fill="rgba(94.5739%,94.3374%,94.3374%,1)"/> - <circle cx="3" cy="30" r="1" fill="rgba(76.7437%,75.7321%,75.7321%,1)"/> - <circle cx="4" cy="30" r="1" fill="rgba(66.1479%,64.6769%,64.6769%,1)"/> - <circle cx="5" cy="30" r="1" fill="rgba(63.8911%,62.3209%,62.3209%,1)"/> - <circle cx="6" cy="30" r="1" fill="rgba(63.653%,62.0722%,62.0722%,1)"/> - <circle cx="7" cy="30" r="1" fill="rgba(63.65%,62.0676%,62.0676%,1)"/> - <circle cx="8" cy="30" r="1" fill="rgba(63.65%,62.0691%,62.0691%,1)"/> - <circle cx="9" cy="30" r="1" fill="rgba(63.65%,62.0691%,62.0691%,1)"/> - <circle cx="10" cy="30" r="1" fill="rgba(63.65%,62.0691%,62.0691%,1)"/> - <circle cx="11" cy="30" r="1" fill="rgba(63.653%,62.0691%,62.0676%,1)"/> - <circle cx="12" cy="30" r="1" fill="rgba(63.6973%,62.0798%,62.0523%,1)"/> - <circle cx="13" cy="30" r="1" fill="rgba(63.7995%,62.0996%,62.0172%,1)"/> - <circle cx="14" cy="30" r="1" fill="rgba(63.9048%,62.1225%,61.9806%,1)"/> - <circle cx="15" cy="30" r="1" fill="rgba(63.9765%,62.1363%,61.9562%,1)"/> - <circle cx="16" cy="30" r="1" fill="rgba(63.9933%,62.1408%,61.9501%,1)"/> - <circle cx="17" cy="30" r="1" fill="rgba(63.9521%,62.1317%,61.9638%,1)"/> - <circle cx="18" cy="30" r="1" fill="rgba(63.8621%,62.1134%,61.9944%,1)"/> - <circle cx="19" cy="30" r="1" fill="rgba(63.7522%,62.0905%,62.034%,1)"/> - <circle cx="20" cy="30" r="1" fill="rgba(63.6698%,62.0737%,62.0615%,1)"/> - <circle cx="21" cy="30" r="1" fill="rgba(63.65%,62.0691%,62.0691%,1)"/> - <circle cx="22" cy="30" r="1" fill="rgba(63.65%,62.0691%,62.0691%,1)"/> - <circle cx="23" cy="30" r="1" fill="rgba(63.65%,62.0691%,62.0691%,1)"/> - <circle cx="24" cy="30" r="1" fill="rgba(63.65%,62.0691%,62.0691%,1)"/> - <circle cx="25" cy="30" r="1" fill="rgba(63.6484%,62.0676%,62.0676%,1)"/> - <circle cx="26" cy="30" r="1" fill="rgba(63.7903%,62.2156%,62.2156%,1)"/> - <circle cx="27" cy="30" r="1" fill="rgba(65.3529%,63.8453%,63.8453%,1)"/> - <circle cx="28" cy="30" r="1" fill="rgba(73.7987%,72.6604%,72.6604%,1)"/> - <circle cx="29" cy="30" r="1" fill="rgba(91.7433%,91.3848%,91.3848%,1)"/> - <circle cx="30" cy="30" r="1" fill="white"/> - <circle cx="31" cy="30" r="1" fill="white"/> - <circle cx="0" cy="31" r="1" fill="white"/> - <circle cx="1" cy="31" r="1" fill="white"/> - <circle cx="2" cy="31" r="1" fill="white"/> - <circle cx="3" cy="31" r="1" fill="rgba(98.5611%,98.5%,98.5%,1)"/> - <circle cx="4" cy="31" r="1" fill="rgba(90.4448%,90.0298%,90.0298%,1)"/> - <circle cx="5" cy="31" r="1" fill="rgba(81.854%,81.0651%,81.0651%,1)"/> - <circle cx="6" cy="31" r="1" fill="rgba(78.5306%,77.5967%,77.5967%,1)"/> - <circle cx="7" cy="31" r="1" fill="rgba(78.3322%,77.3907%,77.3907%,1)"/> - <circle cx="8" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="9" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="10" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="11" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="12" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="13" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="14" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="15" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="16" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="17" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="18" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="19" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="20" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="21" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="22" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="23" cy="31" r="1" fill="rgba(78.3474%,77.406%,77.406%,1)"/> - <circle cx="24" cy="31" r="1" fill="rgba(78.3413%,77.3983%,77.3983%,1)"/> - <circle cx="25" cy="31" r="1" fill="rgba(78.3948%,77.4548%,77.4548%,1)"/> - <circle cx="26" cy="31" r="1" fill="rgba(80.8118%,79.9771%,79.9771%,1)"/> - <circle cx="27" cy="31" r="1" fill="rgba(88.5771%,88.0797%,88.0797%,1)"/> - <circle cx="28" cy="31" r="1" fill="rgba(97.5509%,97.4456%,97.4456%,1)"/> - <circle cx="29" cy="31" r="1" fill="white"/> - <circle cx="30" cy="31" r="1" fill="white"/> - <circle cx="31" cy="31" r="1" fill="white"/> -</svg> diff --git a/tools/steam/icon32.ico b/tools/steam/icon32.ico Binary files differdeleted file mode 100644 index 17637c6784..0000000000 --- a/tools/steam/icon32.ico +++ /dev/null diff --git a/tools/steam/icons.zip b/tools/steam/icons.zip Binary files differdeleted file mode 100644 index eaeee02298..0000000000 --- a/tools/steam/icons.zip +++ /dev/null diff --git a/tools/steam/large_capsule.png b/tools/steam/large_capsule.png Binary files differdeleted file mode 100644 index 14c8ff86d7..0000000000 --- a/tools/steam/large_capsule.png +++ /dev/null diff --git a/tools/steam/main_capsule.png b/tools/steam/main_capsule.png Binary files differdeleted file mode 100644 index 5af9406d11..0000000000 --- a/tools/steam/main_capsule.png +++ /dev/null diff --git a/tools/steam/make_icons.sh b/tools/steam/make_icons.sh index 111d7bec2c..71037cd1c3 100644 --- a/tools/steam/make_icons.sh +++ b/tools/steam/make_icons.sh @@ -1,7 +1,5 @@ -convert -resize 32x32 ../../godot_icon.svg icon32.ico -convert -resize 32x32 ../../godot_icon.svg icon32.icns -for s in 16 24 32 64 96 128 256; do convert -resize ${s}x$s ../../godot_icon.svg icon$s.png; done +convert -resize 32x32 ../../icon.svg icon32.ico +convert -resize 32x32 ../../icon.svg icon32.icns +for s in 16 24 32 64 96 128 256; do convert -resize ${s}x$s ../../icon.svg icon$s.png; done zip icons.zip icon*.png rm icon*.png - - diff --git a/tools/steam/small_capsule.png b/tools/steam/small_capsule.png Binary files differdeleted file mode 100644 index 991896728d..0000000000 --- a/tools/steam/small_capsule.png +++ /dev/null |
