equal
deleted
inserted
replaced
31 |
31 |
32 class Texture : public File { |
32 class Texture : public File { |
33 }; |
33 }; |
34 |
34 |
35 class Shader : public File { |
35 class Shader : public File { |
36 }; |
36 public: |
37 |
37 |
38 class VertexShader : public Shader { |
38 std::string type; |
39 }; |
|
40 |
39 |
41 class FragmentShader : public Shader { |
40 Shader(const std::string& fileName, const std::string& type) : |
|
41 File(fileName), type(type) { |
|
42 } |
|
43 |
42 }; |
44 }; |
43 |
45 |
44 // TODO: support loading whole directory and monitoring using inotify |
46 // TODO: support loading whole directory and monitoring using inotify |
45 std::vector<Texture> textures; |
47 std::vector<Texture> textures; |
46 std::vector<VertexShader> vertexShaders; |
48 std::vector<Shader> shaders; |
47 std::vector<FragmentShader> fragmentShaders; |
|
48 |
49 |
49 unsigned long backgroundColor = (0x33 << 16 | 0x33 << 8 | 0x33); |
50 unsigned long backgroundColor = (0x33 << 16 | 0x33 << 8 | 0x33); |
50 Window rootWindow = 0; |
51 Window rootWindow = 0; |
51 }; |
52 }; |