6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-15 15:29:53 +00:00
Code Issues Projects Releases Wiki Activity

Added an instance of Outputs::CRT::CRT. So progress is now: select CDT, up comes a blank window.

Browse Source
This commit is contained in:
Thomas Harte 2017-07-31 07:16:51 -04:00
parent c0f1313830
commit 1d6fe11906
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Machines/AmstradCPC/AmstradCPC.cpp
View File

@ -18,13 +18,19 @@ void Machine::flush() {
} }
void Machine::setup_output(float aspect_ratio) { void Machine::setup_output(float aspect_ratio) {
crt_.reset(new Outputs::CRT::CRT(256, 1, Outputs::CRT::DisplayType::PAL50, 1));
crt_->set_rgb_sampling_function(
"vec3 rgb_sample(usampler2D sampler, vec2 coordinate, vec2 icoordinate)"
"{"
"return vec3(1.0);"
"}");
} }
void Machine::close_output() { void Machine::close_output() {
} }
std::shared_ptr<Outputs::CRT::CRT> Machine::get_crt() { std::shared_ptr<Outputs::CRT::CRT> Machine::get_crt() {
return nullptr; return crt_;
} }
std::shared_ptr<Outputs::Speaker> Machine::get_speaker() { std::shared_ptr<Outputs::Speaker> Machine::get_speaker() {

3
Machines/AmstradCPC/AmstradCPC.hpp
View File

@ -34,6 +34,9 @@ class Machine:
void run_for(const Cycles cycles); void run_for(const Cycles cycles);
void configure_as_target(const StaticAnalyser::Target &target); void configure_as_target(const StaticAnalyser::Target &target);
private:
std::shared_ptr<Outputs::CRT::CRT> crt_;
}; };
} }