2010-08-09 13:28:56 +00:00
|
|
|
#ifndef NALL_CONFIG_HPP
|
|
|
|
#define NALL_CONFIG_HPP
|
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
#include <nall/platform.hpp>
|
2010-08-09 13:28:56 +00:00
|
|
|
#include <nall/file.hpp>
|
|
|
|
#include <nall/string.hpp>
|
|
|
|
|
|
|
|
namespace nall {
|
2013-04-14 08:52:47 +00:00
|
|
|
namespace Configuration {
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
struct Node {
|
|
|
|
string name;
|
|
|
|
string desc;
|
|
|
|
enum class Type : unsigned { Null, Bool, Signed, Unsigned, Double, String } type = Type::Null;
|
|
|
|
void* data = nullptr;
|
|
|
|
vector<Node> children;
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
bool empty() const {
|
|
|
|
return data == nullptr;
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
string get() const {
|
|
|
|
switch(type) {
|
|
|
|
case Type::Bool: return {*(bool*)data};
|
|
|
|
case Type::Signed: return {*(signed*)data};
|
|
|
|
case Type::Unsigned: return {*(unsigned*)data};
|
|
|
|
case Type::Double: return {*(double*)data};
|
|
|
|
case Type::String: return {*(string*)data};
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
2013-04-14 08:52:47 +00:00
|
|
|
return "";
|
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
void set(const string& value) {
|
|
|
|
switch(type) {
|
Update to v093r02 release.
byuu says:
Changelog:
- nall: fixed major memory leak in string class
- ruby: video shaders support #define-based settings now
- phoenix/GTK+: support > 256x256 icons for window / task bar / alt-tab
- sfc: remove random/ and config/, merge into system/
- ethos: delete higan.png (48x48), replace with higan512.png (512x512)
as new higan.png
- ethos: default gamma to 100% (no color adjustment)
- ethos: use "Video Shaders/Display Emulation/" instead of "Video
Shaders/Emulation/"
- use g++ instead of g++-4.7 (g++ -v must be >= 4.7)
- use -std=c++11 instead of -std=gnu++11
- applied a few patches from Debian upstream to make their packaging job
easier
So because colors are normalized in GLSL, I won't be able to offer video
shaders absolute color literals. We will have to perform basic color
conversion inside the core.
As such, the current plan is to create some sort of Emulator::Settings
interface. With that, I'll connect an option for color correction, which
will be on by default. For FC/SFC, that will mean gamma correction
(darker / stronger colors), and for GB/GBC/GBA, it will mean simulating
the weird brightness levels of the displays. I am undecided on whether
to use pea soup green for the GB or not. By not doing so, it'll be
easier for the display emulation shader to do it.
2013-11-09 11:45:54 +00:00
|
|
|
case Type::Bool: *(bool*)data = (value != "false"); break;
|
2013-04-14 08:52:47 +00:00
|
|
|
case Type::Signed: *(signed*)data = integer(value); break;
|
|
|
|
case Type::Unsigned: *(unsigned*)data = decimal(value); break;
|
2013-07-29 09:42:45 +00:00
|
|
|
case Type::Double: *(double*)data = real(value); break;
|
2013-04-14 08:52:47 +00:00
|
|
|
case Type::String: *(string*)data = value; break;
|
2012-01-15 08:29:57 +00:00
|
|
|
}
|
2013-04-14 08:52:47 +00:00
|
|
|
}
|
2012-01-15 08:29:57 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
void assign() { type = Type::Null; data = nullptr; }
|
|
|
|
void assign(bool& bind) { type = Type::Bool; data = (void*)&bind; }
|
|
|
|
void assign(signed& bind) { type = Type::Signed; data = (void*)&bind; }
|
|
|
|
void assign(unsigned& bind) { type = Type::Unsigned; data = (void*)&bind; }
|
|
|
|
void assign(double& bind) { type = Type::Double; data = (void*)&bind; }
|
|
|
|
void assign(string& bind) { type = Type::String; data = (void*)&bind; }
|
|
|
|
void assign(const Node& node) { operator=(node); }
|
|
|
|
|
|
|
|
template<typename T> void append(T& data, const string& name, const string& desc = "") {
|
|
|
|
Node node;
|
|
|
|
node.assign(data);
|
|
|
|
node.name = name;
|
|
|
|
node.desc = desc;
|
|
|
|
children.append(node);
|
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
void load(Markup::Node path) {
|
|
|
|
for(auto& child : children) {
|
|
|
|
auto leaf = path[child.name];
|
|
|
|
if(!leaf.exists()) continue;
|
Update to v094r09 release.
byuu says:
This will easily be the biggest diff in the history of higan. And not in
a good way.
* target-higan and target-loki have been blown away completely
* nall and ruby massively updated
* phoenix replaced with hiro (pretty near a total rewrite)
* target-higan restarted using hiro (just a window for now)
* all emulation cores updated to compile again
* installation changed to not require root privileges (installs locally)
For the foreseeable future (maybe even permanently?), the new higan UI
will only build under Linux/BSD with GTK+ 2.20+. Probably the most
likely route for Windows/OS X will be to try and figure out how to build
hiro/GTK on those platforms, as awful as that would be. The other
alternative would be to produce new UIs for those platforms ... which
would actually be a good opportunity to make something much more user
friendly.
Being that I just started on this a few hours ago, that means that for
at least a few weeks, don't expect to be able to actually play any
games. Right now, you can pretty much just compile the binary and that's
it. It's quite possible that some nall changes didn't produce
compilation errors, but will produce runtime errors. So until the UI can
actually load games, we won't know if anything is broken. But we should
mostly be okay. It was mostly just trim<1> -> trim changes, moving to
Hash::SHA256 (much cleaner), and patching some reckless memory copy
functions enough to compile.
Progress isn't going to be like it was before: I'm now dividing my time
much thinner between studying and other hobbies.
My aim this time is not to produce a binary for everyone to play games
on. Rather, it's to keep the emulator alive. I want to be able to apply
critical patches again. And I would also like the base of the emulator
to live on, for use in other emulator frontends that utilize higan.
2015-02-26 10:10:46 +00:00
|
|
|
if(!child.empty()) child.set(leaf.text());
|
2013-04-14 08:52:47 +00:00
|
|
|
child.load(leaf);
|
|
|
|
}
|
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
void save(file& fp, unsigned depth = 0) {
|
|
|
|
for(auto& child : children) {
|
|
|
|
if(child.desc) {
|
|
|
|
for(unsigned n = 0; n < depth; n++) fp.print(" ");
|
|
|
|
fp.print("//", child.desc, "\n");
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
2013-04-14 08:52:47 +00:00
|
|
|
for(unsigned n = 0; n < depth; n++) fp.print(" ");
|
|
|
|
fp.print(child.name);
|
|
|
|
if(!child.empty()) fp.print(": ", child.get());
|
|
|
|
fp.print("\n");
|
|
|
|
child.save(fp, depth + 1);
|
|
|
|
if(depth == 0) fp.print("\n");
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
2013-04-14 08:52:47 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct Document : Node {
|
|
|
|
bool load(const string& filename) {
|
|
|
|
if(!file::exists(filename)) return false;
|
|
|
|
auto document = Markup::Document(string::read(filename));
|
|
|
|
Node::load(document);
|
|
|
|
return true;
|
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
bool save(const string& filename) {
|
|
|
|
file fp(filename, file::mode::write);
|
|
|
|
if(!fp.open()) return false;
|
|
|
|
Node::save(fp);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
};
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-04-14 08:52:47 +00:00
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|