rayzor
diff src/modeller.cc @ 14:a9a948809c6f
starting the renderer screen, plus misc stuff
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Sun, 13 Apr 2014 08:06:21 +0300 |
parents | d94a69933a71 |
children | be616b58df99 |
line diff
1.1 --- a/src/modeller.cc Sat Apr 12 23:37:55 2014 +0300 1.2 +++ b/src/modeller.cc Sun Apr 13 08:06:21 2014 +0300 1.3 @@ -6,6 +6,8 @@ 1.4 #include "rayzor.h" 1.5 #include "scene.h" 1.6 #include "keyb.h" 1.7 +#include "scrman.h" 1.8 +#include "logger.h" 1.9 1.10 struct ModellerImpl { 1.11 int mx, my; 1.12 @@ -100,10 +102,10 @@ 1.13 m3d_end(); 1.14 1.15 m3d_begin(M3D_LINES); 1.16 - m3d_color(1.0, 0, 0); 1.17 + m3d_color(0.8, 0, 0); 1.18 m3d_vertex(-dist, 0, 0); 1.19 m3d_vertex(dist, 0, 0); 1.20 - m3d_color(0, 1.0, 0); 1.21 + m3d_color(0.1, 0.3, 0.8); 1.22 m3d_vertex(0, 0, -dist); 1.23 m3d_vertex(0, 0, dist); 1.24 m3d_end(); 1.25 @@ -135,6 +137,18 @@ 1.26 } 1.27 break; 1.28 1.29 + case 'r': 1.30 + case 'R': 1.31 + if(kb_isdown(KB_ALT) || kb_isdown(KB_CTRL)) { 1.32 + Screen *rs = get_screen("renderer"); 1.33 + if(rs) { 1.34 + activate_screen(rs); 1.35 + } else { 1.36 + printlog("failed to find renderer screen!\n"); 1.37 + } 1.38 + } 1.39 + break; 1.40 + 1.41 default: 1.42 break; 1.43 }