Previous 199869 Revisions Next

r41381 Monday 26th October, 2015 at 18:49:17 UTC by Jezze
Cleanup

- some renamings
- reverted one unwanted change in vector.fx
[hlsl]vector.fx
[src/emu]emuopts.c emuopts.h
[src/emu/ui]ui.c
[src/emu/video]vector.c vector.h
[src/osd/sdl]video.c

trunk/hlsl/vector.fx
r249892r249893
7272
7373   float lengthModulate = 1.0f - clamp(Input.LineInfo.x / LengthParams.z, 0.0f, 1.0f);
7474   float minLength = 2.0f - clamp(Input.LineInfo.x - 1.0f, 0.0f, 2.0f);
75   lengthModulate = lerp(lengthModulate, 2.0f, minLength * 0.5f);
75   lengthModulate = lerp(lengthModulate, 4.0f, minLength * 0.5f);
7676   lengthModulate = lerp(1.0f, timeModulate * lengthModulate, LengthParams.y);
7777
7878   float4 outColor = Input.Color * float4(lengthModulate, lengthModulate, lengthModulate, 1.0f);
trunk/src/emu/emuopts.c
r249892r249893
112112   // vector options
113113   { NULL,                                              NULL,        OPTION_HEADER,     "CORE VECTOR OPTIONS" },
114114   { OPTION_ANTIALIAS ";aa",                            "1",         OPTION_BOOLEAN,    "use antialiasing when drawing vectors" },
115   { OPTION_BEAM_MIN,                                   "1.0",       OPTION_FLOAT,      "set vector beam width minimum" },
116   { OPTION_BEAM_MAX,                                   "1.0",       OPTION_FLOAT,      "set vector beam width maximum" },
115   { OPTION_BEAM_WIDTH_MIN,                             "1.0",       OPTION_FLOAT,      "set vector beam width minimum" },
116   { OPTION_BEAM_WIDTH_MAX,                             "1.0",       OPTION_FLOAT,      "set vector beam width maximum" },
117117   { OPTION_BEAM_INTENSITY_WEIGHT,                      "0",         OPTION_FLOAT,      "set vector beam intensity weight " },
118118   { OPTION_FLICKER,                                    "0",         OPTION_FLOAT,      "set vector flicker effect" },
119119
trunk/src/emu/emuopts.h
r249892r249893
119119
120120// core vector options
121121#define OPTION_ANTIALIAS            "antialias"
122#define OPTION_BEAM_MIN             "beam_min"
123#define OPTION_BEAM_MAX             "beam_max"
122#define OPTION_BEAM_WIDTH_MIN       "beam_width_min"
123#define OPTION_BEAM_WIDTH_MAX       "beam_width_max"
124124#define OPTION_BEAM_INTENSITY_WEIGHT   "beam_intensity_weight"
125125#define OPTION_FLICKER              "flicker"
126126
r249892r249893
298298
299299   // core vector options
300300   bool antialias() const { return bool_value(OPTION_ANTIALIAS); }
301   float beam_min() const { return float_value(OPTION_BEAM_MIN); }
302   float beam_max() const { return float_value(OPTION_BEAM_MAX); }
301   float beam_width_min() const { return float_value(OPTION_BEAM_WIDTH_MIN); }
302   float beam_width_max() const { return float_value(OPTION_BEAM_WIDTH_MAX); }
303303   float beam_intensity_weight() const { return float_value(OPTION_BEAM_INTENSITY_WEIGHT); }
304304   float flicker() const { return float_value(OPTION_FLICKER); }
305305
trunk/src/emu/ui/ui.c
r249892r249893
124124static INT32 slider_overxoffset(running_machine &machine, void *arg, std::string *str, INT32 newval);
125125static INT32 slider_overyoffset(running_machine &machine, void *arg, std::string *str, INT32 newval);
126126static INT32 slider_flicker(running_machine &machine, void *arg, std::string *str, INT32 newval);
127static INT32 slider_beam_min(running_machine &machine, void *arg, std::string *str, INT32 newval);
128static INT32 slider_beam_max(running_machine &machine, void *arg, std::string *str, INT32 newval);
127static INT32 slider_beam_width_min(running_machine &machine, void *arg, std::string *str, INT32 newval);
128static INT32 slider_beam_width_max(running_machine &machine, void *arg, std::string *str, INT32 newval);
129129static INT32 slider_beam_intensity_weight(running_machine &machine, void *arg, std::string *str, INT32 newval);
130130static char *slider_get_screen_desc(screen_device &screen);
131131#ifdef MAME_DEBUG
r249892r249893
19691969         // add vector control
19701970         *tailptr = slider_alloc(machine, "Vector Flicker", 0, 0, 1000, 10, slider_flicker, NULL);
19711971         tailptr = &(*tailptr)->next;
1972         *tailptr = slider_alloc(machine, "Beam Width Minimum", 1, 100, 1000, 1, slider_beam_min, NULL);
1972         *tailptr = slider_alloc(machine, "Beam Width Minimum", 1, 100, 1000, 1, slider_beam_width_min, NULL);
19731973         tailptr = &(*tailptr)->next;
1974         *tailptr = slider_alloc(machine, "Beam Width Maximum", 1, 100, 1000, 1, slider_beam_max, NULL);
1974         *tailptr = slider_alloc(machine, "Beam Width Maximum", 1, 100, 1000, 1, slider_beam_width_max, NULL);
19751975         tailptr = &(*tailptr)->next;
19761976         *tailptr = slider_alloc(machine, "Beam Intensity Weight", -1000, 0, 1000, 10, slider_beam_intensity_weight, NULL);
19771977         tailptr = &(*tailptr)->next;
r249892r249893
23542354
23552355
23562356//-------------------------------------------------
2357//  slider_beam_min - minimum vector beam width slider
2357//  slider_beam_width_min - minimum vector beam width slider
23582358//  callback
23592359//-------------------------------------------------
23602360
2361static INT32 slider_beam_min(running_machine &machine, void *arg, std::string *str, INT32 newval)
2361static INT32 slider_beam_width_min(running_machine &machine, void *arg, std::string *str, INT32 newval)
23622362{
23632363   vector_device *vector = NULL;
23642364   if (newval != SLIDER_NOCHANGE)
2365      vector->set_beam_min(MIN((float)newval * 0.01f, vector->get_beam_max()));
2365      vector->set_beam_width_min(MIN((float)newval * 0.01f, vector->get_beam_width_max()));
23662366   if (str != NULL)
2367      strprintf(*str,"%1.2f", (double) vector->get_beam_min());
2368   return floor(vector->get_beam_min() * 100.0f + 0.5f);
2367      strprintf(*str,"%1.2f", (double) vector->get_beam_width_min());
2368   return floor(vector->get_beam_width_min() * 100.0f + 0.5f);
23692369}
23702370
23712371
23722372//-------------------------------------------------
2373//  slider_beam_max - maximum vector beam width slider
2373//  slider_beam_width_max - maximum vector beam width slider
23742374//  callback
23752375//-------------------------------------------------
23762376
2377static INT32 slider_beam_max(running_machine &machine, void *arg, std::string *str, INT32 newval)
2377static INT32 slider_beam_width_max(running_machine &machine, void *arg, std::string *str, INT32 newval)
23782378{
23792379   vector_device *vector = NULL;
23802380   if (newval != SLIDER_NOCHANGE)
2381      vector->set_beam_max(MAX((float)newval * 0.01f, vector->get_beam_min()));
2381      vector->set_beam_width_max(MAX((float)newval * 0.01f, vector->get_beam_width_min()));
23822382   if (str != NULL)
2383      strprintf(*str,"%1.2f", (double) vector->get_beam_max());
2384   return floor(vector->get_beam_max() * 100.0f + 0.5f);
2383      strprintf(*str,"%1.2f", (double) vector->get_beam_width_max());
2384   return floor(vector->get_beam_width_max() * 100.0f + 0.5f);
23852385}
23862386
23872387
trunk/src/emu/video/vector.c
r249892r249893
149149void vector_device::device_start()
150150{
151151   /* Grab the settings for this session */
152   m_beam_width_min = machine().options().beam_min();
153   m_beam_width_max = machine().options().beam_max();
152   m_beam_width_min = machine().options().beam_width_min();
153   m_beam_width_max = machine().options().beam_width_max();
154154   m_beam_intensity_weight = machine().options().beam_intensity_weight();
155155   m_flicker = machine().options().flicker();
156156
r249892r249893
160160   m_vector_list = auto_alloc_array_clear(machine(), point, MAX_POINTS);
161161}
162162
163void vector_device::set_flicker(float _flicker)
163void vector_device::set_flicker(float newval)
164164{
165   m_flicker = _flicker;
165   m_flicker = newval;
166166}
167167
168168float vector_device::get_flicker()
r249892r249893
170170   return m_flicker;
171171}
172172
173void vector_device::set_beam_min(float _beam)
173void vector_device::set_beam_width_min(float newval)
174174{
175   m_beam_width_min = _beam;
175   m_beam_width_min = newval;
176176}
177177
178float vector_device::get_beam_min()
178float vector_device::get_beam_width_min()
179179{
180180   return m_beam_width_min;
181181}
182182
183void vector_device::set_beam_max(float _beam)
183void vector_device::set_beam_width_max(float newval)
184184{
185   m_beam_width_max = _beam;
185   m_beam_width_max = newval;
186186}
187187
188float vector_device::get_beam_max()
188float vector_device::get_beam_width_max()
189189{
190190   return m_beam_width_max;
191191}
192192
193void vector_device::set_beam_intensity_weight(float _beam)
193void vector_device::set_beam_intensity_weight(float newval)
194194{
195   m_beam_intensity_weight = _beam;
195   m_beam_intensity_weight = newval;
196196}
197197
198198float vector_device::get_beam_intensity_weight()
trunk/src/emu/video/vector.h
r249892r249893
4545   void add_point(int x, int y, rgb_t color, int intensity);
4646   void add_clip(int minx, int miny, int maxx, int maxy);
4747
48   void set_flicker(float m_flicker);
48   void set_flicker(float newval);
4949   float get_flicker();
5050
51   void set_beam_min(float _beam);
52   float get_beam_min();
51   void set_beam_width_min(float newval);
52   float get_beam_width_min();
5353
54   void set_beam_max(float _beam);
55   float get_beam_max();
54   void set_beam_width_max(float newval);
55   float get_beam_width_max();
5656
57   void set_beam_intensity_weight(float _beam);
57   void set_beam_intensity_weight(float newval);
5858   float get_beam_intensity_weight();
5959
6060   // device-level overrides
trunk/src/osd/sdl/video.c
r249892r249893
9696   sdl_monitor_info::init();
9797
9898   // we need the beam width in a float, contrary to what the core does.
99   video_config.beamwidth = options().beam_min();
99   video_config.beamwidth = options().beam_width_min();
100100
101101   // initialize the window system so we can make windows
102102   if (!window_init())

https://github.com/mamedev/mame/commit/21b577483b0408f0e33654cc45fa6c5573d72138

Previous 199869 Revisions Next

© 1997-2024 The MAME Team