MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity
mkxp/binding-mri/font-binding.cpp

329 lines
7.2 KiB
C++
Raw Normal View History

Initial commit
2013-09-01 14:27:21 +00:00
/*
** font-binding.cpp
**
** This file is part of mkxp.
**
** Copyright (C) 2013 Jonas Kulla <Nyocurio@gmail.com>
**
** mkxp is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 2 of the License, or
** (at your option) any later version.
**
** mkxp is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with mkxp. If not, see <http://www.gnu.org/licenses/>.
*/
#include "font.h"
#include "binding-util.h"
#include "binding-types.h"
#include "exception.h"
Font: Overhaul font asset discovery Previously, any font names requested by RGSS would be translated directly to filenames by lowercasing and replacing spaces with underscores (and finally doing some extension substitution). To make this whole thing work smoother as well as get closer to how font discovery is done in VX, we now scan the "Fonts/" folder at startup and index all present font assets by their family name; now, if an "Open Sans" font is present in "Fonts/", it will be used regardless of filename. Font assets with "Regular" style are preferred, but in their absence, mkxp will make use of any other style it can find for the respective family. This is not the exact same behavior as VX, but it should cover 95% of use cases. Previously, one could substitute fonts via filenames, ie. to substitute "Arial" with "Open Sans", one would just rename "OpenSans.ttf" to "arial.ttf" and put it in "Fonts/". With the above change, this is no longer possible. As an alternative, one can now explicitly specify font family substitutions via mkxp.conf; eg. for the above case, one would add fontSub=Arial>Open Sans to the configuration file. Multiple such rules can be specified. In the process, I also added the ability to provide 'Font.(default_)name' with an array of font families to search for the first existing one instead of a plain string. This makes the behavior closer to RMXP; however, it doesn't work 100% the same: when a reference to the 'Font.name' array is held and additional strings are added to it without re-assignig the array to 'Font.name', those will be ignored.
2014-04-11 11:37:14 +00:00
#include "sharedstate.h"
#include <string.h>
Initial commit
2013-09-01 14:27:21 +00:00
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
static void
collectStrings(VALUE obj, std::vector<std::string> &out)
{
if (RB_TYPE_P(obj, RUBY_T_STRING))
{
out.push_back(RSTRING_PTR(obj));
}
else if (RB_TYPE_P(obj, RUBY_T_ARRAY))
{
for (long i = 0; i < RARRAY_LEN(obj); ++i)
{
VALUE str = rb_ary_entry(obj, i);
/* Non-string objects are tolerated (ignored) */
if (!RB_TYPE_P(str, RUBY_T_STRING))
continue;
out.push_back(RSTRING_PTR(str));
}
}
}
Initial commit
2013-09-01 14:27:21 +00:00
DEF_TYPE(Font);
RB_METHOD(fontDoesExist)
{
RB_UNUSED_PARAM;
Font: 'exist?' allows any object (returns false if not string)
2014-08-09 15:18:42 +00:00
const char *name = 0;
VALUE nameObj;
rb_get_args(argc, argv, "o", &nameObj RB_ARG_END);
MRI: use RB_TYPE_P() instead of rb_type() Just a very small optimization.
2014-08-25 08:22:23 +00:00
if (RB_TYPE_P(nameObj, RUBY_T_STRING))
Font: 'exist?' allows any object (returns false if not string)
2014-08-09 15:18:42 +00:00
name = rb_string_value_cstr(&nameObj);
Initial commit
2013-09-01 14:27:21 +00:00
return rb_bool_new(Font::doesExist(name));
}
Font: Overhaul font asset discovery Previously, any font names requested by RGSS would be translated directly to filenames by lowercasing and replacing spaces with underscores (and finally doing some extension substitution). To make this whole thing work smoother as well as get closer to how font discovery is done in VX, we now scan the "Fonts/" folder at startup and index all present font assets by their family name; now, if an "Open Sans" font is present in "Fonts/", it will be used regardless of filename. Font assets with "Regular" style are preferred, but in their absence, mkxp will make use of any other style it can find for the respective family. This is not the exact same behavior as VX, but it should cover 95% of use cases. Previously, one could substitute fonts via filenames, ie. to substitute "Arial" with "Open Sans", one would just rename "OpenSans.ttf" to "arial.ttf" and put it in "Fonts/". With the above change, this is no longer possible. As an alternative, one can now explicitly specify font family substitutions via mkxp.conf; eg. for the above case, one would add fontSub=Arial>Open Sans to the configuration file. Multiple such rules can be specified. In the process, I also added the ability to provide 'Font.(default_)name' with an array of font families to search for the first existing one instead of a plain string. This makes the behavior closer to RMXP; however, it doesn't work 100% the same: when a reference to the 'Font.name' array is held and additional strings are added to it without re-assignig the array to 'Font.name', those will be ignored.
2014-04-11 11:37:14 +00:00
RB_METHOD(FontSetName);
Initial commit
2013-09-01 14:27:21 +00:00
RB_METHOD(fontInitialize)
{
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
VALUE namesObj = Qnil;
Initial commit
2013-09-01 14:27:21 +00:00
int size = 0;
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
rb_get_args(argc, argv, "|oi", &namesObj, &size RB_ARG_END);
Font *f;
Initial commit
2013-09-01 14:27:21 +00:00
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
if (NIL_P(namesObj))
{
namesObj = rb_iv_get(rb_obj_class(self), "default_name");
f = new Font(0, size);
}
else
{
std::vector<std::string> names;
collectStrings(namesObj, names);
f = new Font(&names, size);
}
/* This is semantically wrong; the new Font object should take
* a dup'ed object here in case of an array. Ditto for the setters.
* However the same bug/behavior exists in all RM versions. */
rb_iv_set(self, "name", namesObj);
Initial commit
2013-09-01 14:27:21 +00:00
MRI-Binding: Reduce number of object allocations Previously, wrapped instances of mkxp core classes were stored as RData ivars inside the actual object. This turned out to be pointless as RData objects themselves are perfectly valid objects that can carry ivars and have parent classes. Therefore, the RData objects are now exposed directly to the user scripts, effectively halving the amount of object allocations.
2013-10-30 09:06:24 +00:00
setPrivateData(self, f);
Initial commit
2013-09-01 14:27:21 +00:00
/* Wrap property objects */
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
f->initDynAttribs();
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
wrapProperty(self, &f->getColor(), "color", ColorType);
Initial commit
2013-09-01 14:27:21 +00:00
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
if (rgssVer >= 3)
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
wrapProperty(self, &f->getOutColor(), "out_color", ColorType);
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
Initial commit
2013-09-01 14:27:21 +00:00
return self;
}
MRI-Binding: Bind #initialize_copy for clonable classes This replaces the previously directly bound #clone methods, which weren't really the "the Ruby way". Rubys default Object#clone will call into our #init_copy methods instead. Partly incorporates pull request #3 by /cremno.
2013-10-31 09:13:24 +00:00
RB_METHOD(fontInitializeCopy)
{
MRI-Binding: Fix typo that led to access of freed Color objects Also fix my moronic variable naming in the InitCopy functions that let to this mess up in the first place.
2013-12-15 09:13:58 +00:00
VALUE origObj;
MRI-Binding: Optimize RB_ARG_END vaarg guard It's enough to check this only in debug mode. Make this an empty define in release mode.
2013-12-20 10:29:12 +00:00
rb_get_args(argc, argv, "o", &origObj RB_ARG_END);
MRI-Binding: Bind #initialize_copy for clonable classes This replaces the previously directly bound #clone methods, which weren't really the "the Ruby way". Rubys default Object#clone will call into our #init_copy methods instead. Partly incorporates pull request #3 by /cremno.
2013-10-31 09:13:24 +00:00
MRI-Binding: Fix typo that led to access of freed Color objects Also fix my moronic variable naming in the InitCopy functions that let to this mess up in the first place.
2013-12-15 09:13:58 +00:00
if (!OBJ_INIT_COPY(self, origObj))
MRI-Binding: Bind #initialize_copy for clonable classes This replaces the previously directly bound #clone methods, which weren't really the "the Ruby way". Rubys default Object#clone will call into our #init_copy methods instead. Partly incorporates pull request #3 by /cremno.
2013-10-31 09:13:24 +00:00
return self;
MRI-Binding: Fix typo that led to access of freed Color objects Also fix my moronic variable naming in the InitCopy functions that let to this mess up in the first place.
2013-12-15 09:13:58 +00:00
Font *orig = getPrivateData<Font>(origObj);
Font *f = new Font(*orig);
setPrivateData(self, f);
MRI-Binding: Bind #initialize_copy for clonable classes This replaces the previously directly bound #clone methods, which weren't really the "the Ruby way". Rubys default Object#clone will call into our #init_copy methods instead. Partly incorporates pull request #3 by /cremno.
2013-10-31 09:13:24 +00:00
/* Wrap property objects */
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
f->initDynAttribs();
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
wrapProperty(self, &f->getColor(), "color", ColorType);
MRI-Binding: Bind #initialize_copy for clonable classes This replaces the previously directly bound #clone methods, which weren't really the "the Ruby way". Rubys default Object#clone will call into our #init_copy methods instead. Partly incorporates pull request #3 by /cremno.
2013-10-31 09:13:24 +00:00
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
if (rgssVer >= 3)
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
wrapProperty(self, &f->getOutColor(), "out_color", ColorType);
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
MRI-Binding: Bind #initialize_copy for clonable classes This replaces the previously directly bound #clone methods, which weren't really the "the Ruby way". Rubys default Object#clone will call into our #init_copy methods instead. Partly incorporates pull request #3 by /cremno.
2013-10-31 09:13:24 +00:00
return self;
}
Initial commit
2013-09-01 14:27:21 +00:00
RB_METHOD(FontGetName)
{
RB_UNUSED_PARAM;
Font: Overhaul font asset discovery Previously, any font names requested by RGSS would be translated directly to filenames by lowercasing and replacing spaces with underscores (and finally doing some extension substitution). To make this whole thing work smoother as well as get closer to how font discovery is done in VX, we now scan the "Fonts/" folder at startup and index all present font assets by their family name; now, if an "Open Sans" font is present in "Fonts/", it will be used regardless of filename. Font assets with "Regular" style are preferred, but in their absence, mkxp will make use of any other style it can find for the respective family. This is not the exact same behavior as VX, but it should cover 95% of use cases. Previously, one could substitute fonts via filenames, ie. to substitute "Arial" with "Open Sans", one would just rename "OpenSans.ttf" to "arial.ttf" and put it in "Fonts/". With the above change, this is no longer possible. As an alternative, one can now explicitly specify font family substitutions via mkxp.conf; eg. for the above case, one would add fontSub=Arial>Open Sans to the configuration file. Multiple such rules can be specified. In the process, I also added the ability to provide 'Font.(default_)name' with an array of font families to search for the first existing one instead of a plain string. This makes the behavior closer to RMXP; however, it doesn't work 100% the same: when a reference to the 'Font.name' array is held and additional strings are added to it without re-assignig the array to 'Font.name', those will be ignored.
2014-04-11 11:37:14 +00:00
return rb_iv_get(self, "name");
}
Initial commit
2013-09-01 14:27:21 +00:00
RB_METHOD(FontSetName)
{
Font *f = getPrivateData<Font>(self);
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
rb_check_argc(argc, 1);
std::vector<std::string> namesObj;
collectStrings(argv[0], namesObj);
Initial commit
2013-09-01 14:27:21 +00:00
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
f->setName(namesObj);
rb_iv_set(self, "name", argv[0]);
Initial commit
2013-09-01 14:27:21 +00:00
Font: Overhaul font asset discovery Previously, any font names requested by RGSS would be translated directly to filenames by lowercasing and replacing spaces with underscores (and finally doing some extension substitution). To make this whole thing work smoother as well as get closer to how font discovery is done in VX, we now scan the "Fonts/" folder at startup and index all present font assets by their family name; now, if an "Open Sans" font is present in "Fonts/", it will be used regardless of filename. Font assets with "Regular" style are preferred, but in their absence, mkxp will make use of any other style it can find for the respective family. This is not the exact same behavior as VX, but it should cover 95% of use cases. Previously, one could substitute fonts via filenames, ie. to substitute "Arial" with "Open Sans", one would just rename "OpenSans.ttf" to "arial.ttf" and put it in "Fonts/". With the above change, this is no longer possible. As an alternative, one can now explicitly specify font family substitutions via mkxp.conf; eg. for the above case, one would add fontSub=Arial>Open Sans to the configuration file. Multiple such rules can be specified. In the process, I also added the ability to provide 'Font.(default_)name' with an array of font families to search for the first existing one instead of a plain string. This makes the behavior closer to RMXP; however, it doesn't work 100% the same: when a reference to the 'Font.name' array is held and additional strings are added to it without re-assignig the array to 'Font.name', those will be ignored.
2014-04-11 11:37:14 +00:00
return argv[0];
Initial commit
2013-09-01 14:27:21 +00:00
}
Revert Disposable concept back into core Pretty much a revert of e858bbdcf5cc8120dd169d7efb8ae8d13ab0b5c5. We need this in core to properly implement F12 reset.
2014-09-23 19:12:58 +00:00
template<class C>
static void checkDisposed(VALUE) {}
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
DEF_PROP_OBJ_VAL(Font, Color, Color, "color")
DEF_PROP_OBJ_VAL(Font, Color, OutColor, "out_color")
Initial commit
2013-09-01 14:27:21 +00:00
DEF_PROP_I(Font, Size)
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
Initial commit
2013-09-01 14:27:21 +00:00
DEF_PROP_B(Font, Bold)
DEF_PROP_B(Font, Italic)
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
DEF_PROP_B(Font, Shadow)
DEF_PROP_B(Font, Outline)
Initial commit
2013-09-01 14:27:21 +00:00
#define DEF_KLASS_PROP(Klass, type, PropName, param_t_s, value_fun) \
RB_METHOD(Klass##Get##PropName) \
{ \
RB_UNUSED_PARAM; \
return value_fun(Klass::get##PropName()); \
} \
RB_METHOD(Klass##Set##PropName) \
{ \
RB_UNUSED_PARAM; \
type value; \
MRI-Binding: Optimize RB_ARG_END vaarg guard It's enough to check this only in debug mode. Make this an empty define in release mode.
2013-12-20 10:29:12 +00:00
rb_get_args(argc, argv, param_t_s, &value RB_ARG_END); \
Initial commit
2013-09-01 14:27:21 +00:00
Klass::set##PropName(value); \
return value_fun(value); \
}
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
DEF_KLASS_PROP(Font, int, DefaultSize, "i", rb_fix_new)
DEF_KLASS_PROP(Font, bool, DefaultBold, "b", rb_bool_new)
DEF_KLASS_PROP(Font, bool, DefaultItalic, "b", rb_bool_new)
DEF_KLASS_PROP(Font, bool, DefaultShadow, "b", rb_bool_new)
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
DEF_KLASS_PROP(Font, bool, DefaultOutline, "b", rb_bool_new)
MRI-Binding: Font: Add get/set_default_out_color binding
2014-08-22 21:49:18 +00:00
RB_METHOD(FontGetDefaultOutColor)
{
RB_UNUSED_PARAM;
return rb_iv_get(self, "default_out_color");
}
RB_METHOD(FontSetDefaultOutColor)
{
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
RB_UNUSED_PARAM;
MRI-Binding: Font: Add get/set_default_out_color binding
2014-08-22 21:49:18 +00:00
VALUE colorObj;
rb_get_args(argc, argv, "o", &colorObj RB_ARG_END);
Color *c = getPrivateDataCheck<Color>(colorObj, ColorType);
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
Font::setDefaultOutColor(*c);
MRI-Binding: Font: Add get/set_default_out_color binding
2014-08-22 21:49:18 +00:00
return colorObj;
}
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
Initial commit
2013-09-01 14:27:21 +00:00
RB_METHOD(FontGetDefaultName)
{
RB_UNUSED_PARAM;
Font: Overhaul font asset discovery Previously, any font names requested by RGSS would be translated directly to filenames by lowercasing and replacing spaces with underscores (and finally doing some extension substitution). To make this whole thing work smoother as well as get closer to how font discovery is done in VX, we now scan the "Fonts/" folder at startup and index all present font assets by their family name; now, if an "Open Sans" font is present in "Fonts/", it will be used regardless of filename. Font assets with "Regular" style are preferred, but in their absence, mkxp will make use of any other style it can find for the respective family. This is not the exact same behavior as VX, but it should cover 95% of use cases. Previously, one could substitute fonts via filenames, ie. to substitute "Arial" with "Open Sans", one would just rename "OpenSans.ttf" to "arial.ttf" and put it in "Fonts/". With the above change, this is no longer possible. As an alternative, one can now explicitly specify font family substitutions via mkxp.conf; eg. for the above case, one would add fontSub=Arial>Open Sans to the configuration file. Multiple such rules can be specified. In the process, I also added the ability to provide 'Font.(default_)name' with an array of font families to search for the first existing one instead of a plain string. This makes the behavior closer to RMXP; however, it doesn't work 100% the same: when a reference to the 'Font.name' array is held and additional strings are added to it without re-assignig the array to 'Font.name', those will be ignored.
2014-04-11 11:37:14 +00:00
return rb_iv_get(self, "default_name");
Initial commit
2013-09-01 14:27:21 +00:00
}
RB_METHOD(FontSetDefaultName)
{
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
RB_UNUSED_PARAM;
Initial commit
2013-09-01 14:27:21 +00:00
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
rb_check_argc(argc, 1);
std::vector<std::string> namesObj;
collectStrings(argv[0], namesObj);
Font::setDefaultName(namesObj, shState->fontState());
rb_iv_set(self, "default_name", argv[0]);
Initial commit
2013-09-01 14:27:21 +00:00
Font: Overhaul font asset discovery Previously, any font names requested by RGSS would be translated directly to filenames by lowercasing and replacing spaces with underscores (and finally doing some extension substitution). To make this whole thing work smoother as well as get closer to how font discovery is done in VX, we now scan the "Fonts/" folder at startup and index all present font assets by their family name; now, if an "Open Sans" font is present in "Fonts/", it will be used regardless of filename. Font assets with "Regular" style are preferred, but in their absence, mkxp will make use of any other style it can find for the respective family. This is not the exact same behavior as VX, but it should cover 95% of use cases. Previously, one could substitute fonts via filenames, ie. to substitute "Arial" with "Open Sans", one would just rename "OpenSans.ttf" to "arial.ttf" and put it in "Fonts/". With the above change, this is no longer possible. As an alternative, one can now explicitly specify font family substitutions via mkxp.conf; eg. for the above case, one would add fontSub=Arial>Open Sans to the configuration file. Multiple such rules can be specified. In the process, I also added the ability to provide 'Font.(default_)name' with an array of font families to search for the first existing one instead of a plain string. This makes the behavior closer to RMXP; however, it doesn't work 100% the same: when a reference to the 'Font.name' array is held and additional strings are added to it without re-assignig the array to 'Font.name', those will be ignored.
2014-04-11 11:37:14 +00:00
return argv[0];
Initial commit
2013-09-01 14:27:21 +00:00
}
RB_METHOD(FontGetDefaultColor)
{
RB_UNUSED_PARAM;
return rb_iv_get(self, "default_color");
}
RB_METHOD(FontSetDefaultColor)
{
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
RB_UNUSED_PARAM;
Initial commit
2013-09-01 14:27:21 +00:00
VALUE colorObj;
MRI-Binding: Optimize RB_ARG_END vaarg guard It's enough to check this only in debug mode. Make this an empty define in release mode.
2013-12-20 10:29:12 +00:00
rb_get_args(argc, argv, "o", &colorObj RB_ARG_END);
Initial commit
2013-09-01 14:27:21 +00:00
Color *c = getPrivateDataCheck<Color>(colorObj, ColorType);
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
Font::setDefaultColor(*c);
Initial commit
2013-09-01 14:27:21 +00:00
return colorObj;
}
#define INIT_KLASS_PROP_BIND(Klass, PropName, prop_name_s) \
{ \
rb_define_class_method(klass, prop_name_s, Klass##Get##PropName); \
rb_define_class_method(klass, prop_name_s "=", Klass##Set##PropName); \
}
void
fontBindingInit()
{
VALUE klass = rb_define_class("Font", rb_cObject);
MRI-Binding: Reduce number of object allocations Previously, wrapped instances of mkxp core classes were stored as RData ivars inside the actual object. This turned out to be pointless as RData objects themselves are perfectly valid objects that can carry ivars and have parent classes. Therefore, the RData objects are now exposed directly to the user scripts, effectively halving the amount of object allocations.
2013-10-30 09:06:24 +00:00
rb_define_alloc_func(klass, classAllocate<&FontType>);
Initial commit
2013-09-01 14:27:21 +00:00
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
Font::initDefaultDynAttribs();
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
wrapProperty(klass, &Font::getDefaultColor(), "default_color", ColorType);
Font/MRI: Improve handling of (default_)name attributes More accurate behavior, such as Font objects properly inheriting their name attributes, and centralization of code for picking the first existing name from a passed string array. Also centralizes initial default_name population in core. Note: This currently breaks the mruby binding build.
2016-01-05 07:41:47 +00:00
/* Initialize default names */
const std::vector<std::string> &defNames = Font::getInitialDefaultNames();
VALUE defNamesObj;
if (defNames.size() == 1)
{
defNamesObj = rb_str_new_cstr(defNames[0].c_str());
}
else
{
defNamesObj = rb_ary_new2(defNames.size());
for (size_t i = 0; i < defNames.size(); ++i)
rb_ary_push(defNamesObj, rb_str_new_cstr(defNames[i].c_str()));
}
rb_iv_set(klass, "default_name", defNamesObj);
Initial commit
2013-09-01 14:27:21 +00:00
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
if (rgssVer >= 3)
Pass value object attributes by reference (instead of pointer) This underlines that no reference inside the setter is taken, and that these attributes are non-nullable. Also removes a couple of superfluous attribute macros.
2014-10-25 21:33:41 +00:00
wrapProperty(klass, &Font::getDefaultOutColor(), "default_out_color", ColorType);
Core/MRI: Fix handling of Etc/Font properties The gist of it is that for Etc and Font props, the assignment operator (eg. 'sprite.color=') does not take a reference of the right hand parameter and replaces its previous one with it (this was the old behavior). Rather, it keeps its internal property object and copies the parameter object into it by value. The getter is unchanged; it still returns a reference to the internal property object. s = Sprite.new c = Color.new s.color = c p s.color == c # => true p s.color.object_id == c.object_id # => false (true before) c = s.color p s.color.object_id == c.object_id # => true
2014-09-04 23:26:03 +00:00
Initial commit
2013-09-01 14:27:21 +00:00
INIT_KLASS_PROP_BIND(Font, DefaultName, "default_name");
INIT_KLASS_PROP_BIND(Font, DefaultSize, "default_size");
INIT_KLASS_PROP_BIND(Font, DefaultBold, "default_bold");
INIT_KLASS_PROP_BIND(Font, DefaultItalic, "default_italic");
INIT_KLASS_PROP_BIND(Font, DefaultColor, "default_color");
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
if (rgssVer >= 2)
{
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
INIT_KLASS_PROP_BIND(Font, DefaultShadow, "default_shadow");
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
}
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
if (rgssVer >= 3)
{
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
INIT_KLASS_PROP_BIND(Font, DefaultOutline, "default_outline");
MRI-Binding: Font: Add get/set_default_out_color binding
2014-08-22 21:49:18 +00:00
INIT_KLASS_PROP_BIND(Font, DefaultOutColor, "default_out_color");
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
}
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
Initial commit
2013-09-01 14:27:21 +00:00
rb_define_class_method(klass, "exist?", fontDoesExist);
MRI-Binding: Bind #initialize_copy for clonable classes This replaces the previously directly bound #clone methods, which weren't really the "the Ruby way". Rubys default Object#clone will call into our #init_copy methods instead. Partly incorporates pull request #3 by /cremno.
2013-10-31 09:13:24 +00:00
_rb_define_method(klass, "initialize", fontInitialize);
_rb_define_method(klass, "initialize_copy", fontInitializeCopy);
Initial commit
2013-09-01 14:27:21 +00:00
INIT_PROP_BIND(Font, Name, "name");
INIT_PROP_BIND(Font, Size, "size");
INIT_PROP_BIND(Font, Bold, "bold");
INIT_PROP_BIND(Font, Italic, "italic");
INIT_PROP_BIND(Font, Color, "color");
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
if (rgssVer >= 2)
{
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
INIT_PROP_BIND(Font, Shadow, "shadow");
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
}
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
if (rgssVer >= 3)
{
Font: Add missing RGSS2+ props basic plumbing (and bind most in MRI) No core implementations yet for shadow and outline color.
2014-08-15 21:18:02 +00:00
INIT_PROP_BIND(Font, Outline, "outline");
INIT_PROP_BIND(Font, OutColor, "out_color");
Merge separate RGSS version build configs into one Setup active RGSS version at runtime. Desired version can be specified via config, or as default, auto detected from the game files. This removes the need to build specifically for each version, which should help packaging a lot. This also greatly reduces the danger of introducing code that wouldn't compile on all RGSS version paths (as certain code paths were completely ifdef'd out). This can be optimized more, eg. not compiling shaders that aren't needed in the active version.
2014-08-28 21:11:10 +00:00
}
Initial commit
2013-09-01 14:27:21 +00:00
}