Version 0.9.4.9 - Alpha (see changelog.txt)

This commit is contained in:
Kenny Shields 2012-12-26 07:45:33 -05:00
parent 524be5c2da
commit 9e63b394ad
28 changed files with 4037 additions and 1324 deletions

View File

@ -1,3 +1,13 @@
================================================
Version 0.9.4.9 - Alpha (December 26 - 2012)
================================================
[ADDED] a new default skin: Blue (basic)
[ADDED] a new default skin: Orange (basic)
[ADDED] a new skins library function: loveframes.skins.GetAvailalbe()
[CHANGED] the license from CC BY-SA 3.0 to CC BY 3.0
[CHANGED] made minor improvements to the default skins
================================================ ================================================
Version 0.9.4.8 - Alpha (December 24 - 2012) Version 0.9.4.8 - Alpha (December 24 - 2012)
================================================ ================================================

View File

@ -9,7 +9,7 @@ loveframes = {}
-- library info -- library info
loveframes.info = {} loveframes.info = {}
loveframes.info.author = "Kenny Shields" loveframes.info.author = "Kenny Shields"
loveframes.info.version = "0.9.4.8" loveframes.info.version = "0.9.4.9"
loveframes.info.stage = "Alpha" loveframes.info.stage = "Alpha"
-- library configurations -- library configurations
@ -88,7 +88,6 @@ end
function loveframes.update(dt) function loveframes.update(dt)
local base = loveframes.base local base = loveframes.base
base:update(dt) base:update(dt)
end end
@ -100,14 +99,9 @@ end
function loveframes.draw() function loveframes.draw()
local base = loveframes.base local base = loveframes.base
-- set the drawcount to zero
loveframes.drawcount = 0
-- draw the base object
base:draw() base:draw()
-- draw the debug library loveframes.drawcount = 0
loveframes.debug.draw() loveframes.debug.draw()
end end
@ -119,7 +113,6 @@ end
function loveframes.mousepressed(x, y, button) function loveframes.mousepressed(x, y, button)
local base = loveframes.base local base = loveframes.base
base:mousepressed(x, y, button) base:mousepressed(x, y, button)
end end
@ -131,7 +124,6 @@ end
function loveframes.mousereleased(x, y, button) function loveframes.mousereleased(x, y, button)
local base = loveframes.base local base = loveframes.base
base:mousereleased(x, y, button) base:mousereleased(x, y, button)
-- reset the hover object -- reset the hover object
@ -149,7 +141,6 @@ end
function loveframes.keypressed(key, unicode) function loveframes.keypressed(key, unicode)
local base = loveframes.base local base = loveframes.base
base:keypressed(key, unicode) base:keypressed(key, unicode)
end end
@ -161,7 +152,6 @@ end
function loveframes.keyreleased(key) function loveframes.keyreleased(key)
local base = loveframes.base local base = loveframes.base
base:keyreleased(key) base:keyreleased(key)
end end

View File

@ -1,484 +1,227 @@
Löve Frames is licensed under the Creative Löve Frames is licensed under the Creative
Commons Attribution-ShareAlike 3.0 Unported (CC Commons Attribution 3.0 Unported (CC BY 3.0) license.
BY-SA 3.0) license. Below is the entire legal code Below is the entire legal code for the license.
for the license. For more information on this For more information on this license, please visit
license, please visit this web page: this web page: http://creativecommons.org/licenses/by/3.0/
http://creativecommons.org/licenses/by-sa/3.0/
License License
THE WORK (AS DEFINED BELOW) IS THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS
PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE").
PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW.
IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE
LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED OR COPYRIGHT LAW IS PROHIBITED.
UNDER THIS LICENSE OR COPYRIGHT LAW IS
PROHIBITED.
BY EXERCISING ANY RIGHTS TO THE BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU
WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE.
BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT,
THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
AND CONDITIONS.
1. Definitions 1. Definitions
"Adaptation" means a work based upon the Work, or upon the Work and other
pre-existing works, such as a translation, adaptation, derivative work,
arrangement of music or other alterations of a literary or artistic work,
or phonogram or performance and includes cinematographic adaptations or any
other form in which the Work may be recast, transformed, or adapted including
in any form recognizably derived from the original, except that a work that
constitutes a Collection will not be considered an Adaptation for the purpose
of this License. For the avoidance of doubt, where the Work is a musical work,
performance or phonogram, the synchronization of the Work in timed-relation with
a moving image ("synching") will be considered an Adaptation for the purpose of
this License.
"Adaptation" means a work based upon the Work, "Collection" means a collection of literary or artistic works, such as encyclopedias
or upon the Work and other pre-existing works, and anthologies, or performances, phonograms or broadcasts, or other works or subject
such as a translation, adaptation, derivative matter other than works listed in Section 1(f) below, which, by reason of the selection
work, arrangement of music or other alterations of and arrangement of their contents, constitute intellectual creations, in which the Work
a literary or artistic work, or phonogram or is included in its entirety in unmodified form along with one or more other contributions,
performance and includes cinematographic each constituting separate and independent works in themselves, which together are assembled
adaptations or any other form in which the Work into a collective whole. A work that constitutes a Collection will not be considered an
may be recast, transformed, or adapted including Adaptation (as defined above) for the purposes of this License.
in any form recognizably derived from the
original, except that a work that constitutes a
Collection will not be considered an Adaptation
for the purpose of this License. For the avoidance
of doubt, where the Work is a musical work,
performance or phonogram, the synchronization of
the Work in timed-relation with a moving image
("synching") will be considered an Adaptation
for the purpose of this License.
"Collection" means a collection of literary or "Distribute" means to make available to the public the original and copies of the Work or
artistic works, such as encyclopedias and Adaptation, as appropriate, through sale or other transfer of ownership.
anthologies, or performances, phonograms or
broadcasts, or other works or subject matter other
than works listed in Section 1(f) below, which, by
reason of the selection and arrangement of their
contents, constitute intellectual creations, in
which the Work is included in its entirety in
unmodified form along with one or more other
contributions, each constituting separate and
independent works in themselves, which together
are assembled into a collective whole. A work that
constitutes a Collection will not be considered an
Adaptation (as defined below) for the purposes of
this License.
"Creative Commons Compatible
License" means a license that is listed at
http://creativecommons.org/compatiblelicenses that
has been approved by Creative Commons as being
essentially equivalent to this License, including,
at a minimum, because that license: (i) contains
terms that have the same purpose, meaning and
effect as the License Elements of this License;
and, (ii) explicitly permits the relicensing of
adaptations of works made available under that
license under this License or a Creative Commons
jurisdiction license with the same License
Elements as this License.
"Distribute"
means to make available to the public the original
and copies of the Work or Adaptation, as
appropriate, through sale or other transfer of
ownership.
"License Elements" means the
following high-level license attributes as
selected by Licensor and indicated in the title of
this License: Attribution, ShareAlike.
"Licensor" means the individual, individuals, "Licensor" means the individual, individuals, entity or entities that offer(s) the Work
entity or entities that offer(s) the Work under under the terms of this License.
the terms of this License.
"Original
Author" means, in the case of a literary or
artistic work, the individual, individuals, entity
or entities who created the Work or if no
individual or entity can be identified, the
publisher; and in addition (i) in the case of a
performance the actors, singers, musicians,
dancers, and other persons who act, sing, deliver,
declaim, play in, interpret or otherwise perform
literary or artistic works or expressions of
folklore; (ii) in the case of a phonogram the
producer being the person or legal entity who
first fixes the sounds of a performance or other
sounds; and, (iii) in the case of broadcasts, the
organization that transmits the broadcast.
"Work" means the literary and/or artistic work "Original Author" means, in the case of a literary or artistic work, the individual,
offered under the terms of this License including individuals, entity or entities who created the Work or if no individual or entity can be
without limitation any production in the literary, identified, the publisher; and in addition (i) in the case of a performance the actors, singers,
scientific and artistic domain, whatever may be musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or
the mode or form of its expression including otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a
digital form, such as a book, pamphlet and other phonogram the producer being the person or legal entity who first fixes the sounds of a
writing; a lecture, address, sermon or other work performance or other sounds; and, (iii) in the case of broadcasts, the organization that
of the same nature; a dramatic or transmits the broadcast.
dramatico-musical work; a choreographic work or
entertainment in dumb show; a musical composition
with or without words; a cinematographic work to
which are assimilated works expressed by a process
analogous to cinematography; a work of drawing,
painting, architecture, sculpture, engraving or
lithography; a photographic work to which are
assimilated works expressed by a process analogous
to photography; a work of applied art; an
illustration, map, plan, sketch or
three-dimensional work relative to geography,
topography, architecture or science; a
performance; a broadcast; a phonogram; a
compilation of data to the extent it is protected
as a copyrightable work; or a work performed by a
variety or circus performer to the extent it is
not otherwise considered a literary or artistic
work.
"You" means an individual or entity
exercising rights under this License who has not
previously violated the terms of this License with
respect to the Work, or who has received express
permission from the Licensor to exercise rights
under this License despite a previous violation.
"Publicly Perform" means to perform public "Work" means the literary and/or artistic work offered under the terms of this License including
recitations of the Work and to communicate to the without limitation any production in the literary, scientific and artistic domain, whatever may
public those public recitations, by any means or be the mode or form of its expression including digital form, such as a book, pamphlet and other
process, including by wire or wireless means or writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical
public digital performances; to make available to work; a choreographic work or entertainment in dumb show; a musical composition with or without words;
the public Works in such a way that members of the a cinematographic work to which are assimilated works expressed by a process analogous to cinematography;
public may access these Works from a place and at a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to
a place individually chosen by them; to perform which are assimilated works expressed by a process analogous to photography; a work of applied art; an
the Work to the public by any means or process and illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture
the communication to the public of the or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected
performances of the Work, including by public as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not
digital performance; to broadcast and rebroadcast otherwise considered a literary or artistic work.
the Work by any means including signs, sounds or
images.
"Reproduce" means to make copies of
the Work by any means including without limitation
by sound or visual recordings and the right of
fixation and reproducing fixations of the Work,
including storage of a protected performance or
phonogram in digital form or other electronic
medium.
2. Fair Dealing Rights. Nothing in this "You" means an individual or entity exercising rights under this License who has not previously violated
License is intended to reduce, limit, or restrict the terms of this License with respect to the Work, or who has received express permission from the Licensor
any uses free from copyright or rights arising to exercise rights under this License despite a previous violation.
from limitations or exceptions that are provided
for in connection with the copyright protection
under copyright law or other applicable
laws.
3. License Grant. Subject to the terms "Publicly Perform" means to perform public recitations of the Work and to communicate to the public
and conditions of this License, Licensor hereby those public recitations, by any means or process, including by wire or wireless means or public
grants You a worldwide, royalty-free, digital performances; to make available to the public Works in such a way that members of the public
non-exclusive, perpetual (for the duration of the may access these Works from a place and at a place individually chosen by them; to perform the Work
applicable copyright) license to exercise the to the public by any means or process and the communication to the public of the performances of the
rights in the Work as stated below: Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including
signs, sounds or images.
to "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual
Reproduce the Work, to incorporate the Work into recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected
one or more Collections, and to Reproduce the Work performance or phonogram in digital form or other electronic medium.
as incorporated in the Collections;
to create
and Reproduce Adaptations provided that any such
Adaptation, including any translation in any
medium, takes reasonable steps to clearly label,
demarcate or otherwise identify that changes were
made to the original Work. For example, a
translation could be marked "The original work
was translated from English to Spanish," or a
modification could indicate "The original work
has been modified.";
to Distribute and
Publicly Perform the Work including as
incorporated in Collections; and,
to
Distribute and Publicly Perform Adaptations.
2. Fair Dealing Rights.
Nothing in this License is intended to reduce, limit, or restrict any uses free from
copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright
protection under copyright law or other applicable laws.
3. License Grant.
Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide,
royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the
rights in the Work as stated below:
to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work
as incorporated in the Collections;
to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any
medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made
to the original Work. For example, a translation could be marked "The original work was translated from
English to Spanish," or a modification could indicate "The original work has been modified.";
to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
to Distribute and Publicly Perform Adaptations.
For the avoidance of doubt: For the avoidance of doubt:
Non-waivable Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties
Compulsory License Schemes. In those jurisdictions through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive
in which the right to collect royalties through right to collect such royalties for any exercise by You of the rights granted under this License;
any statutory or compulsory licensing scheme Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties
cannot be waived, the Licensor reserves the through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive
exclusive right to collect such royalties for any right to collect such royalties for any exercise by You of the rights granted under this License; and,
exercise by You of the rights granted under this Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or,
License; in the event that the Licensor is a member of a collecting society that administers voluntary licensing
Waivable Compulsory License schemes, via that society, from any exercise by You of the rights granted under this License.
Schemes. In those jurisdictions in which the right
to collect royalties through any statutory or
compulsory licensing scheme can be waived, the
Licensor waives the exclusive right to collect
such royalties for any exercise by You of the
rights granted under this License; and,
Voluntary License Schemes. The Licensor waives the The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights
right to collect royalties, whether individually include the right to make such modifications as are technically necessary to exercise the rights in other media and
or, in the event that the Licensor is a member of formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
a collecting society that administers voluntary
licensing schemes, via that society, from any
exercise by You of the rights granted under this
License.
The above rights may be exercised in 4. Restrictions.
all media and formats whether now known or
hereafter devised. The above rights include the
right to make such modifications as are
technically necessary to exercise the rights in
other media and formats. Subject to Section 8(f),
all rights not expressly granted by Licensor are
hereby reserved.
4. Restrictions. The license The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
granted in Section 3 above is expressly made
subject to and limited by the following
restrictions:
You may Distribute or You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a
Publicly Perform the Work only under the terms of copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute
this License. You must include a copy of, or the or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License
Uniform Resource Identifier (URI) for, this or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of
License with every copy of the Work You Distribute the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to
or Publicly Perform. You may not offer or impose the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute
any terms on the Work that restrict the terms of or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict
this License or the ability of the recipient of the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms
the Work to exercise the rights granted to that of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require
recipient under the terms of the License. You may the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection,
not sublicense the Work. You must keep intact all upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required
notices that refer to this License and to the by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent
disclaimer of warranties with every copy of the practicable, remove from the Adaptation any credit as required by Section 4(b), as requested.
Work You Distribute or Publicly Perform. When You
Distribute or Publicly Perform the Work, You may
not impose any effective technological measures on
the Work that restrict the ability of a recipient
of the Work from You to exercise the rights
granted to that recipient under the terms of the
License. This Section 4(a) applies to the Work as
incorporated in a Collection, but this does not
require the Collection apart from the Work itself
to be made subject to the terms of this License.
If You create a Collection, upon notice from any
Licensor You must, to the extent practicable,
remove from the Collection any credit as required
by Section 4(c), as requested. If You create an
Adaptation, upon notice from any Licensor You
must, to the extent practicable, remove from the
Adaptation any credit as required by Section 4(c),
as requested.
You may Distribute or Publicly
Perform an Adaptation only under the terms of: (i)
this License; (ii) a later version of this License
with the same License Elements as this License;
(iii) a Creative Commons jurisdiction license
(either this or a later license version) that
contains the same License Elements as this License
(e.g., Attribution-ShareAlike 3.0 US)); (iv) a
Creative Commons Compatible License. If you
license the Adaptation under one of the licenses
mentioned in (iv), you must comply with the terms
of that license. If you license the Adaptation
under the terms of any of the licenses mentioned
in (i), (ii) or (iii) (the "Applicable
License"), you must comply with the terms of the
Applicable License generally and the following
provisions: (I) You must include a copy of, or the
URI for, the Applicable License with every copy of
each Adaptation You Distribute or Publicly
Perform; (II) You may not offer or impose any
terms on the Adaptation that restrict the terms of
the Applicable License or the ability of the
recipient of the Adaptation to exercise the rights
granted to that recipient under the terms of the
Applicable License; (III) You must keep intact all
notices that refer to the Applicable License and
to the disclaimer of warranties with every copy of
the Work as included in the Adaptation You
Distribute or Publicly Perform; (IV) when You
Distribute or Publicly Perform the Adaptation, You
may not impose any effective technological
measures on the Adaptation that restrict the
ability of a recipient of the Adaptation from You
to exercise the rights granted to that recipient
under the terms of the Applicable License. This
Section 4(b) applies to the Adaptation as
incorporated in a Collection, but this does not
require the Collection apart from the Adaptation
itself to be made subject to the terms of the
Applicable License.
If You Distribute, or
Publicly Perform the Work or any Adaptations or
Collections, You must, unless a request has been
made pursuant to Section 4(a), keep intact all
copyright notices for the Work and provide,
reasonable to the medium or means You are
utilizing: (i) the name of the Original Author (or
pseudonym, if applicable) if supplied, and/or if
the Original Author and/or Licensor designate
another party or parties (e.g., a sponsor
institute, publishing entity, journal) for
attribution ("Attribution Parties") in
Licensor's copyright notice, terms of service or
by other reasonable means, the name of such party
or parties; (ii) the title of the Work if
supplied; (iii) to the extent reasonably
practicable, the URI, if any, that Licensor
specifies to be associated with the Work, unless
such URI does not refer to the copyright notice or
licensing information for the Work; and (iv) ,
consistent with Ssection 3(b), in the case of an
Adaptation, a credit identifying the use of the
Work in the Adaptation (e.g., "French translation
of the Work by Original Author," or "Screenplay
based on original Work by Original Author"). The
credit required by this Section 4(c) may be
implemented in any reasonable manner; provided,
however, that in the case of a Adaptation or
Collection, at a minimum such credit will appear,
if a credit for all contributing authors of the
Adaptation or Collection appears, then as part of
these credits and in a manner at least as
prominent as the credits for the other
contributing authors. For the avoidance of doubt,
You may only use the credit required by this
Section for the purpose of attribution in the
manner set out above and, by exercising Your
rights under this License, You may not implicitly
or explicitly assert or imply any connection with,
sponsorship or endorsement by the Original Author,
Licensor and/or Attribution Parties, as
appropriate, of You or Your use of the Work,
without the separate, express prior written
permission of the Original Author, Licensor and/or
Attribution Parties.
Except as otherwise
agreed in writing by the Licensor or as may be
otherwise permitted by applicable law, if You
Reproduce, Distribute or Publicly Perform the Work
either by itself or as part of any Adaptations or
Collections, You must not distort, mutilate,
modify or take other derogatory action in relation
to the Work which would be prejudicial to the
Original Author's honor or reputation. Licensor
agrees that in those jurisdictions (e.g. Japan),
in which any exercise of the right granted in
Section 3(b) of this License (the right to make
Adaptations) would be deemed to be a distortion,
mutilation, modification or other derogatory
action prejudicial to the Original Author's honor
and reputation, the Licensor will waive or not
assert, as appropriate, this Section, to the
fullest extent permitted by the applicable
national law, to enable You to reasonably exercise
Your right under Section 3(b) of this License
(right to make Adaptations) but not
otherwise.
5. Representations, Warranties and If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has
Disclaimer been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the
medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied,
and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing
entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other
reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably
practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the
copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation,
a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or
"Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any
reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear,
if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner
at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit
required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this
License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original
Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior
written permission of the Original Author, Licensor and/or Attribution Parties.
UNLESS OTHERWISE MUTUALLY AGREED TO Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce,
BY THE PARTIES IN WRITING, LICENSOR OFFERS THE Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort,
WORK AS-IS AND MAKES NO REPRESENTATIONS OR mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's
WARRANTIES OF ANY KIND CONCERNING THE WORK, honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in
EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other
INCLUDING, WITHOUT LIMITATION, WARRANTIES OF derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate,
TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under
PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT Section 3(b) of this License (right to make Adaptations) but not otherwise.
OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF
ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. 5. Representations, Warranties and Disclaimer
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF
IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO
APPLY TO YOU. REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,
NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
EXCLUSION MAY NOT APPLY TO YOU.
6. Limitation on Liability. 6. Limitation on Liability.
EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW,
IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL
LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE
CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
ARISING OUT OF THIS LICENSE OR THE USE OF THE
WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
7. Termination 7. Termination
This License and the rights granted hereunder will terminate automatically upon any breach by You of the
terms of this License. Individuals or entities who have received Adaptations or Collections from You under
this License, however, will not have their licenses terminated provided such individuals or entities remain
in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
This License and the rights granted hereunder Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable
will terminate automatically upon any breach by copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different
You of the terms of this License. Individuals or license terms or to stop distributing the Work at any time; provided, however that any such election will not serve
entities who have received Adaptations or to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License),
Collections from You under this License, however, and this License will continue in full force and effect unless terminated as stated above.
will not have their licenses terminated provided
such individuals or entities remain in full
compliance with those licenses. Sections 1, 2, 5,
6, 7, and 8 will survive any termination of this
License.
Subject to the above terms and
conditions, the license granted here is perpetual
(for the duration of the applicable copyright in
the Work). Notwithstanding the above, Licensor
reserves the right to release the Work under
different license terms or to stop distributing
the Work at any time; provided, however that any
such election will not serve to withdraw this
License (or any other license that has been, or is
required to be, granted under the terms of this
License), and this License will continue in full
force and effect unless terminated as stated
above.
8. Miscellaneous 8. Miscellaneous
Each time You Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a
Distribute or Publicly Perform the Work or a license to the Work on the same terms and conditions as the license granted to You under this License.
Collection, the Licensor offers to the recipient a
license to the Work on the same terms and
conditions as the license granted to You under
this License.
Each time You Distribute or
Publicly Perform an Adaptation, Licensor offers to
the recipient a license to the original Work on
the same terms and conditions as the license
granted to You under this License.
If any
provision of this License is invalid or
unenforceable under applicable law, it shall not
affect the validity or enforceability of the
remainder of the terms of this License, and
without further action by the parties to this
agreement, such provision shall be reformed to the
minimum extent necessary to make such provision
valid and enforceable.
No term or provision
of this License shall be deemed waived and no
breach consented to unless such waiver or consent
shall be in writing and signed by the party to be
charged with such waiver or consent.
This
License constitutes the entire agreement between
the parties with respect to the Work licensed
here. There are no understandings, agreements or
representations with respect to the Work not
specified here. Licensor shall not be bound by any
additional provisions that may appear in any
communication from You. This License may not be
modified without the mutual written agreement of
the Licensor and You.
The rights granted
under, and the subject matter referenced, in this
License were drafted utilizing the terminology of
the Berne Convention for the Protection of
Literary and Artistic Works (as amended on
September 28, 1979), the Rome Convention of 1961,
the WIPO Copyright Treaty of 1996, the WIPO
Performances and Phonograms Treaty of 1996 and the
Universal Copyright Convention (as revised on July
24, 1971). These rights and subject matter take
effect in the relevant jurisdiction in which the
License terms are sought to be enforced according
to the corresponding provisions of the
implementation of those treaty provisions in the
applicable national law. If the standard suite of
rights granted under applicable copyright law
includes additional rights not granted under this
License, such additional rights are deemed to be
included in the License; this License is not
intended to restrict the license of any rights
under applicable law.
Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to
the original Work on the same terms and conditions as the license granted to You under this License.
If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the
validity or enforceability of the remainder of the terms of this License, and without further action by the
parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such
provision valid and enforceable.
No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or
consent shall be in writing and signed by the party to be charged with such waiver or consent.
This License constitutes the entire agreement between the parties with respect to the Work licensed here.
There are no understandings, agreements or representations with respect to the Work not specified here.
Licensor shall not be bound by any additional provisions that may appear in any communication from You.
This License may not be modified without the mutual written agreement of the Licensor and You.
The rights granted under, and the subject matter referenced, in this License were drafted utilizing the
terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on
September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances
and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971).
These rights and subject matter take effect in the relevant jurisdiction in which the License terms are
sought to be enforced according to the corresponding provisions of the implementation of those treaty
provisions in the applicable national law. If the standard suite of rights granted under applicable
copyright law includes additional rights not granted under this License, such additional rights are deemed
to be included in the License; this License is not intended to restrict the license of any rights under
applicable law.

View File

@ -711,7 +711,7 @@ function newobject:CheckHover()
local baseparent = self:GetBaseParent() local baseparent = self:GetBaseParent()
if baseparent ~= modalobject and self.type ~= "multichoice-row" then if baseparent ~= modalobject and self.type ~= "multichoicerow" then
self.hover = false self.hover = false

View File

@ -12,7 +12,7 @@ local newobject = loveframes.NewObject("multichoicelist", "loveframes_object_mul
--]]--------------------------------------------------------- --]]---------------------------------------------------------
function newobject:initialize(object) function newobject:initialize(object)
self.type = "multichoice-list" self.type = "multichoicelist"
self.parent = loveframes.base self.parent = loveframes.base
self.list = object self.list = object
self.x = object.x self.x = object.x
@ -243,7 +243,7 @@ end
--]]--------------------------------------------------------- --]]---------------------------------------------------------
function newobject:AddItem(object) function newobject:AddItem(object)
if object.type ~= "multichoice-row" then if object.type ~= "multichoicerow" then
return return
end end

View File

@ -12,7 +12,7 @@ local newobject = loveframes.NewObject("multichoicerow", "loveframes_object_mult
--]]--------------------------------------------------------- --]]---------------------------------------------------------
function newobject:initialize() function newobject:initialize()
self.type = "multichoice-row" self.type = "multichoicerow"
self.text = "" self.text = ""
self.width = 50 self.width = 50
self.height = 25 self.height = 25

View File

@ -6,13 +6,13 @@ Love Frames is a GUI library for [LOVE](https://love2d.org/). For information on
## License ## License
Love Frames is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license. Love Frames is licensed under the Creative Commons Attribution 3.0 Unported (CC BY 3.0) license.
For more information on this license, please read license.txt or visit this web page: http://creativecommons.org/licenses/by-sa/3.0/ For more information on this license, please read license.txt or visit this web page: http://creativecommons.org/licenses/by/3.0/
## Credits ## Credits
Created by Kenny Shields Created by Kenny Shields
**Third Party Libraries** **Third-Party Libraries**
- middleclass: kikito - https://github.com/kikito/middleclass - middleclass by kikito - https://github.com/kikito/middleclass

View File

@ -57,3 +57,14 @@ function loveframes.skins.Register(skin)
end end
end end
--[[---------------------------------------------------------
- func: GetAvailable()
- desc: gets all available skins
--]]---------------------------------------------------------
function loveframes.skins.GetAvailable()
local available = loveframes.skins.available
return available
end

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

1505
skins/Blue (basic)/skin.lua Normal file

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,7 @@ skin.controls.button_text_font = smallfont
-- image button -- image button
skin.controls.imagebutton_text_down_color = {255, 255, 255, 255} skin.controls.imagebutton_text_down_color = {255, 255, 255, 255}
skin.controls.imagebutton_text_nohover_color = {0, 0, 0, 200} skin.controls.imagebutton_text_nohover_color = {255, 255, 255, 200}
skin.controls.imagebutton_text_hover_color = {255, 255, 255, 255} skin.controls.imagebutton_text_hover_color = {255, 255, 255, 255}
skin.controls.imagebutton_text_font = imagebuttonfont skin.controls.imagebutton_text_font = imagebuttonfont
@ -204,47 +204,6 @@ function skin.OutlinedRectangle(x, y, width, height, ovt, ovb, ovl, ovr)
end end
--[[---------------------------------------------------------
- func: DrawRepeatingImage(image, x, y, width, height)
- desc: draw a repeating image
--]]---------------------------------------------------------
function skin.DrawRepeatingImage(image, x, y, width, height)
local image = image
local iwidth = image:getWidth()
local iheight = image:getHeight()
local cords = {}
local posx = 0
local posy = 0
local stencilfunc = function() love.graphics.rectangle("fill", x, y, width, height) end
local stencil = love.graphics.newStencil(stencilfunc)
local images = 0
while posy < height do
table.insert(cords, {posx, posy})
if posx >= width then
posx = 0
posy = posy + iheight
else
posx = posx + iwidth
end
end
love.graphics.setStencil(stencil)
for k, v in ipairs(cords) do
love.graphics.setColor(255, 255, 255, 255)
love.graphics.draw(image, x + v[1], y + v[2])
images = images + 1
end
love.graphics.setStencil()
end
--[[--------------------------------------------------------- --[[---------------------------------------------------------
- func: skin.DrawGradient(x, y, width, height, color) - func: skin.DrawGradient(x, y, width, height, color)
- desc: draws a gradient - desc: draws a gradient
@ -253,11 +212,10 @@ function skin.DrawGradient(x, y, width, height, color)
local color = color local color = color
local percent = 0 local percent = 0
local once = false
for i=1, height - 1 do for i=1, (height - 1) do
percent = i/height * 255 percent = i/height * 255
color = {color[1], color[2], color[3], loveframes.util.Round(percent)} color[4] = loveframes.util.Round(percent)
love.graphics.setColor(unpack(color)) love.graphics.setColor(unpack(color))
love.graphics.rectangle("fill", x, y + i, width, 1) love.graphics.rectangle("fill", x, y + i, width, 1)
end end
@ -281,7 +239,7 @@ function skin.DrawFrame(object)
local bordercolor = skin.controls.frame_border_color local bordercolor = skin.controls.frame_border_color
local namecolor = skin.controls.frame_name_color local namecolor = skin.controls.frame_name_color
local font = skin.controls.frame_name_font local font = skin.controls.frame_name_font
local gradientcolor = {} local gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3] - 20, 255}
-- frame body -- frame body
love.graphics.setColor(unpack(bodycolor)) love.graphics.setColor(unpack(bodycolor))
@ -290,7 +248,6 @@ function skin.DrawFrame(object)
-- frame top bar -- frame top bar
love.graphics.setColor(unpack(topcolor)) love.graphics.setColor(unpack(topcolor))
love.graphics.rectangle("fill", x, y, width, 25) love.graphics.rectangle("fill", x, y, width, 25)
gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3] - 20, 255}
skin.DrawGradient(x, y, width, 25, gradientcolor) skin.DrawGradient(x, y, width, 25, gradientcolor)
love.graphics.setColor(unpack(bordercolor)) love.graphics.setColor(unpack(bordercolor))
skin.OutlinedRectangle(x, y + 25, width, 1) skin.OutlinedRectangle(x, y + 25, width, 1)
@ -413,7 +370,6 @@ function skin.DrawCloseButton(object)
local bodydowncolor = skin.controls.closebutton_body_down_color local bodydowncolor = skin.controls.closebutton_body_down_color
local bodyhovercolor = skin.controls.closebutton_body_hover_color local bodyhovercolor = skin.controls.closebutton_body_hover_color
local bodynohovercolor = skin.controls.closebutton_body_nohover_color local bodynohovercolor = skin.controls.closebutton_body_nohover_color
local gradientcolor = {}
if down == true then if down == true then
@ -486,6 +442,9 @@ function skin.DrawImageButton(object)
local font = skin.controls.imagebutton_text_font local font = skin.controls.imagebutton_text_font
local twidth = font:getWidth(object.text) local twidth = font:getWidth(object.text)
local theight = font:getHeight(object.text) local theight = font:getHeight(object.text)
local textdowncolor = skin.controls.imagebutton_text_down_color
local texthovercolor = skin.controls.imagebutton_text_hover_color
local textnohovercolor = skin.controls.imagebutton_text_nohover_color
if down then if down then
@ -497,7 +456,7 @@ function skin.DrawImageButton(object)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(0, 0, 0, 255) love.graphics.setColor(0, 0, 0, 255)
love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 5 + 1) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 5 + 1)
love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) love.graphics.setColor(unpack(textdowncolor))
love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 6 + 1) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 6 + 1)
elseif hover then elseif hover then
@ -510,7 +469,7 @@ function skin.DrawImageButton(object)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(0, 0, 0, 255) love.graphics.setColor(0, 0, 0, 255)
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5)
love.graphics.setColor(unpack(skin.controls.imagebutton_text_hover_color)) love.graphics.setColor(unpack(texthovercolor))
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6)
else else
@ -523,7 +482,7 @@ function skin.DrawImageButton(object)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(0, 0, 0, 255) love.graphics.setColor(0, 0, 0, 255)
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5)
love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) love.graphics.setColor(unpack(textnohovercolor))
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6)
end end
@ -551,14 +510,13 @@ function skin.DrawProgressBar(object)
local barcolor = skin.controls.progressbar_bar_color local barcolor = skin.controls.progressbar_bar_color
local textcolor = skin.controls.progressbar_text_color local textcolor = skin.controls.progressbar_text_color
local bordercolor = skin.controls.progressbar_border_color local bordercolor = skin.controls.progressbar_border_color
local gradientcolor = {} local gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255}
-- progress bar body -- progress bar body
love.graphics.setColor(unpack(bodycolor)) love.graphics.setColor(unpack(bodycolor))
love.graphics.rectangle("fill", x, y, width, height) love.graphics.rectangle("fill", x, y, width, height)
love.graphics.setColor(unpack(barcolor)) love.graphics.setColor(unpack(barcolor))
love.graphics.rectangle("fill", x, y, barwidth, height) love.graphics.rectangle("fill", x, y, barwidth, height)
gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255}
skin.DrawGradient(x, y, barwidth, height, gradientcolor) skin.DrawGradient(x, y, barwidth, height, gradientcolor)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(unpack(textcolor)) love.graphics.setColor(unpack(textcolor))
@ -1193,36 +1151,44 @@ function skin.DrawScrollButton(object)
if scrolltype == "up" then if scrolltype == "up" then
local image = skin.images["arrow-up.png"] local image = skin.images["arrow-up.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
elseif scrolltype == "down" then elseif scrolltype == "down" then
local image = skin.images["arrow-down.png"] local image = skin.images["arrow-down.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
elseif scrolltype == "left" then elseif scrolltype == "left" then
local image = skin.images["arrow-left.png"] local image = skin.images["arrow-left.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
elseif scrolltype == "right" then elseif scrolltype == "right" then
local image = skin.images["arrow-right.png"] local image = skin.images["arrow-right.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
end end
end end
@ -1335,19 +1301,27 @@ function skin.DrawCheckBox(object)
local width = object:GetBoxWidth() local width = object:GetBoxWidth()
local height = object:GetBoxHeight() local height = object:GetBoxHeight()
local checked = object:GetChecked() local checked = object:GetChecked()
local gradientcolor = {} local hover = object:GetHover()
local bodycolor = skin.controls.checkbox_body_color
local bordercolor = skin.controls.checkbox_border_color
local checkcolor = skin.controls.checkbox_check_color
love.graphics.setColor(unpack(skin.controls.checkbox_body_color)) love.graphics.setColor(unpack(bodycolor))
love.graphics.rectangle("fill", x, y, width, height) love.graphics.rectangle("fill", x, y, width, height)
love.graphics.setColor(unpack(skin.controls.checkbox_border_color)) love.graphics.setColor(unpack(bordercolor))
skin.OutlinedRectangle(x, y, width, height) skin.OutlinedRectangle(x, y, width, height)
if checked then if checked then
love.graphics.setColor(unpack(skin.controls.checkbox_check_color)) love.graphics.setColor(unpack(checkcolor))
love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8) love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8)
end end
if hover then
love.graphics.setColor(unpack(bordercolor))
skin.OutlinedRectangle(x + 4, y + 4, width - 8, height - 8)
end
end end
--[[--------------------------------------------------------- --[[---------------------------------------------------------
@ -1496,7 +1470,7 @@ function skin.DrawColumnListArea(object)
local height = object:GetHeight() local height = object:GetHeight()
local bodycolor = skin.controls.columnlistarea_body_color local bodycolor = skin.controls.columnlistarea_body_color
love.graphics.setColor(unpack(skin.controls.columnlistarea_body_color)) love.graphics.setColor(unpack(bodycolor))
love.graphics.rectangle("fill", x, y, width, height) love.graphics.rectangle("fill", x, y, width, height)
end end

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,7 @@ skin.controls.button_text_font = smallfont
-- image button -- image button
skin.controls.imagebutton_text_down_color = {255, 255, 255, 255} skin.controls.imagebutton_text_down_color = {255, 255, 255, 255}
skin.controls.imagebutton_text_nohover_color = {0, 0, 0, 200} skin.controls.imagebutton_text_nohover_color = {255, 255, 255, 200}
skin.controls.imagebutton_text_hover_color = {255, 255, 255, 255} skin.controls.imagebutton_text_hover_color = {255, 255, 255, 255}
skin.controls.imagebutton_text_font = imagebuttonfont skin.controls.imagebutton_text_font = imagebuttonfont
@ -204,47 +204,6 @@ function skin.OutlinedRectangle(x, y, width, height, ovt, ovb, ovl, ovr)
end end
--[[---------------------------------------------------------
- func: DrawRepeatingImage(image, x, y, width, height)
- desc: draw a repeating image
--]]---------------------------------------------------------
function skin.DrawRepeatingImage(image, x, y, width, height)
local image = image
local iwidth = image:getWidth()
local iheight = image:getHeight()
local cords = {}
local posx = 0
local posy = 0
local stencilfunc = function() love.graphics.rectangle("fill", x, y, width, height) end
local stencil = love.graphics.newStencil(stencilfunc)
local images = 0
while posy < height do
table.insert(cords, {posx, posy})
if posx >= width then
posx = 0
posy = posy + iheight
else
posx = posx + iwidth
end
end
love.graphics.setStencil(stencil)
for k, v in ipairs(cords) do
love.graphics.setColor(255, 255, 255, 255)
love.graphics.draw(image, x + v[1], y + v[2])
images = images + 1
end
love.graphics.setStencil()
end
--[[--------------------------------------------------------- --[[---------------------------------------------------------
- func: skin.DrawGradient(x, y, width, height, color) - func: skin.DrawGradient(x, y, width, height, color)
- desc: draws a gradient - desc: draws a gradient
@ -253,11 +212,10 @@ function skin.DrawGradient(x, y, width, height, color)
local color = color local color = color
local percent = 0 local percent = 0
local once = false
for i=1, height - 1 do for i=1, (height - 1) do
percent = i/height * 255 percent = i/height * 255
color = {color[1], color[2], color[3], loveframes.util.Round(percent)} color[4] = loveframes.util.Round(percent)
love.graphics.setColor(unpack(color)) love.graphics.setColor(unpack(color))
love.graphics.rectangle("fill", x, y + i, width, 1) love.graphics.rectangle("fill", x, y + i, width, 1)
end end
@ -281,7 +239,7 @@ function skin.DrawFrame(object)
local bordercolor = skin.controls.frame_border_color local bordercolor = skin.controls.frame_border_color
local namecolor = skin.controls.frame_name_color local namecolor = skin.controls.frame_name_color
local font = skin.controls.frame_name_font local font = skin.controls.frame_name_font
local gradientcolor = {} local gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3], 255}
-- frame body -- frame body
love.graphics.setColor(unpack(bodycolor)) love.graphics.setColor(unpack(bodycolor))
@ -290,7 +248,6 @@ function skin.DrawFrame(object)
-- frame top bar -- frame top bar
love.graphics.setColor(unpack(topcolor)) love.graphics.setColor(unpack(topcolor))
love.graphics.rectangle("fill", x, y, width, 25) love.graphics.rectangle("fill", x, y, width, 25)
gradientcolor = {topcolor[1] - 20, topcolor[2] - 20, topcolor[3], 255}
skin.DrawGradient(x, y, width, 25, gradientcolor) skin.DrawGradient(x, y, width, 25, gradientcolor)
love.graphics.setColor(unpack(bordercolor)) love.graphics.setColor(unpack(bordercolor))
skin.OutlinedRectangle(x, y + 25, width, 1) skin.OutlinedRectangle(x, y + 25, width, 1)
@ -333,7 +290,7 @@ function skin.DrawButton(object)
local bordernohovercolor = skin.controls.button_border_down_color local bordernohovercolor = skin.controls.button_border_down_color
local gradientcolor = {} local gradientcolor = {}
if down == true then if down then
-- button body -- button body
love.graphics.setColor(unpack(bodydowncolor)) love.graphics.setColor(unpack(bodydowncolor))
@ -351,7 +308,7 @@ function skin.DrawButton(object)
love.graphics.setColor(unpack(borderdowncolor)) love.graphics.setColor(unpack(borderdowncolor))
skin.OutlinedRectangle(x, y, width, height) skin.OutlinedRectangle(x, y, width, height)
elseif hover == true then elseif hover then
-- button body -- button body
love.graphics.setColor(unpack(bodyhovercolor)) love.graphics.setColor(unpack(bodyhovercolor))
@ -413,7 +370,6 @@ function skin.DrawCloseButton(object)
local bodydowncolor = skin.controls.closebutton_body_down_color local bodydowncolor = skin.controls.closebutton_body_down_color
local bodyhovercolor = skin.controls.closebutton_body_hover_color local bodyhovercolor = skin.controls.closebutton_body_hover_color
local bodynohovercolor = skin.controls.closebutton_body_nohover_color local bodynohovercolor = skin.controls.closebutton_body_nohover_color
local gradientcolor = {}
if down == true then if down == true then
@ -486,6 +442,9 @@ function skin.DrawImageButton(object)
local font = skin.controls.imagebutton_text_font local font = skin.controls.imagebutton_text_font
local twidth = font:getWidth(object.text) local twidth = font:getWidth(object.text)
local theight = font:getHeight(object.text) local theight = font:getHeight(object.text)
local textdowncolor = skin.controls.imagebutton_text_down_color
local texthovercolor = skin.controls.imagebutton_text_hover_color
local textnohovercolor = skin.controls.imagebutton_text_nohover_color
if down then if down then
@ -497,7 +456,7 @@ function skin.DrawImageButton(object)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(0, 0, 0, 255) love.graphics.setColor(0, 0, 0, 255)
love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 5 + 1) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 5 + 1)
love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) love.graphics.setColor(unpack(textdowncolor))
love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 6 + 1) love.graphics.print(text, x + width/2 - twidth/2 + 1, y + height - theight - 6 + 1)
elseif hover then elseif hover then
@ -510,7 +469,7 @@ function skin.DrawImageButton(object)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(0, 0, 0, 255) love.graphics.setColor(0, 0, 0, 255)
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5)
love.graphics.setColor(unpack(skin.controls.imagebutton_text_hover_color)) love.graphics.setColor(unpack(texthovercolor))
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6)
else else
@ -523,7 +482,7 @@ function skin.DrawImageButton(object)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(0, 0, 0, 255) love.graphics.setColor(0, 0, 0, 255)
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 5)
love.graphics.setColor(unpack(skin.controls.imagebutton_text_down_color)) love.graphics.setColor(unpack(textnohovercolor))
love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6) love.graphics.print(text, x + width/2 - twidth/2, y + height - theight - 6)
end end
@ -551,14 +510,13 @@ function skin.DrawProgressBar(object)
local barcolor = skin.controls.progressbar_bar_color local barcolor = skin.controls.progressbar_bar_color
local textcolor = skin.controls.progressbar_text_color local textcolor = skin.controls.progressbar_text_color
local bordercolor = skin.controls.progressbar_border_color local bordercolor = skin.controls.progressbar_border_color
local gradientcolor = {} local gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255}
-- progress bar body -- progress bar body
love.graphics.setColor(unpack(bodycolor)) love.graphics.setColor(unpack(bodycolor))
love.graphics.rectangle("fill", x, y, width, height) love.graphics.rectangle("fill", x, y, width, height)
love.graphics.setColor(unpack(barcolor)) love.graphics.setColor(unpack(barcolor))
love.graphics.rectangle("fill", x, y, barwidth, height) love.graphics.rectangle("fill", x, y, barwidth, height)
gradientcolor = {barcolor[1], barcolor[2] - 20, barcolor[3], 255}
skin.DrawGradient(x, y, barwidth, height, gradientcolor) skin.DrawGradient(x, y, barwidth, height, gradientcolor)
love.graphics.setFont(font) love.graphics.setFont(font)
love.graphics.setColor(unpack(textcolor)) love.graphics.setColor(unpack(textcolor))
@ -756,8 +714,6 @@ function skin.DrawTabButton(object)
local x = object:GetX() local x = object:GetX()
local y = object:GetY() local y = object:GetY()
local width = object:GetWidth()
local height = object:GetHeight()
local hover = object:GetHover() local hover = object:GetHover()
local text = object:GetText() local text = object:GetText()
local image = object:GetImage() local image = object:GetImage()
@ -793,6 +749,9 @@ function skin.DrawTabButton(object)
object.height = theight + 5 object.height = theight + 5
end end
local width = object:GetWidth()
local height = object:GetHeight()
if tabnumber == ptabnumber then if tabnumber == ptabnumber then
-- button body -- button body
@ -943,7 +902,7 @@ function skin.DrawMultiChoiceRow(object)
love.graphics.setFont(font) love.graphics.setFont(font)
if object.hover == true then if object.hover then
love.graphics.setColor(unpack(bodyhovecolor)) love.graphics.setColor(unpack(bodyhovecolor))
love.graphics.rectangle("fill", x, y, width, height) love.graphics.rectangle("fill", x, y, width, height)
love.graphics.setColor(unpack(texthovercolor)) love.graphics.setColor(unpack(texthovercolor))
@ -1192,36 +1151,44 @@ function skin.DrawScrollButton(object)
if scrolltype == "up" then if scrolltype == "up" then
local image = skin.images["arrow-up.png"] local image = skin.images["arrow-up.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
elseif scrolltype == "down" then elseif scrolltype == "down" then
local image = skin.images["arrow-down.png"] local image = skin.images["arrow-down.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
elseif scrolltype == "left" then elseif scrolltype == "left" then
local image = skin.images["arrow-left.png"] local image = skin.images["arrow-left.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
elseif scrolltype == "right" then elseif scrolltype == "right" then
local image = skin.images["arrow-right.png"] local image = skin.images["arrow-right.png"]
local imagewidth = image:getWidth()
local imageheight = image:getHeight()
if hover then if hover then
love.graphics.setColor(255, 255, 255, 255) love.graphics.setColor(255, 255, 255, 255)
else else
love.graphics.setColor(255, 255, 255, 150) love.graphics.setColor(255, 255, 255, 150)
end end
love.graphics.draw(image, x + width/2 - image:getWidth()/2, y + height/2 - image:getHeight()/2) love.graphics.draw(image, x + width/2 - imagewidth/2, y + height/2 - imageheight/2)
end end
end end
@ -1334,19 +1301,27 @@ function skin.DrawCheckBox(object)
local width = object:GetBoxWidth() local width = object:GetBoxWidth()
local height = object:GetBoxHeight() local height = object:GetBoxHeight()
local checked = object:GetChecked() local checked = object:GetChecked()
local gradientcolor = {} local hover = object:GetHover()
local bodycolor = skin.controls.checkbox_body_color
local bordercolor = skin.controls.checkbox_border_color
local checkcolor = skin.controls.checkbox_check_color
love.graphics.setColor(unpack(skin.controls.checkbox_body_color)) love.graphics.setColor(unpack(bodycolor))
love.graphics.rectangle("fill", x, y, width, height) love.graphics.rectangle("fill", x, y, width, height)
love.graphics.setColor(unpack(skin.controls.checkbox_border_color)) love.graphics.setColor(unpack(bordercolor))
skin.OutlinedRectangle(x, y, width, height) skin.OutlinedRectangle(x, y, width, height)
if checked then if checked then
love.graphics.setColor(unpack(skin.controls.checkbox_check_color)) love.graphics.setColor(unpack(checkcolor))
love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8) love.graphics.rectangle("fill", x + 4, y + 4, width - 8, height - 8)
end end
if hover then
love.graphics.setColor(unpack(bordercolor))
skin.OutlinedRectangle(x + 4, y + 4, width - 8, height - 8)
end
end end
--[[--------------------------------------------------------- --[[---------------------------------------------------------
@ -1495,7 +1470,7 @@ function skin.DrawColumnListArea(object)
local height = object:GetHeight() local height = object:GetHeight()
local bodycolor = skin.controls.columnlistarea_body_color local bodycolor = skin.controls.columnlistarea_body_color
love.graphics.setColor(unpack(skin.controls.columnlistarea_body_color)) love.graphics.setColor(unpack(bodycolor))
love.graphics.rectangle("fill", x, y, width, height) love.graphics.rectangle("fill", x, y, width, height)
end end