tavli

diff src/board.h @ 2:893192aea099

board keeps objects instead of raw meshes
author John Tsiombikas <nuclear@member.fsf.org>
date Mon, 22 Jun 2015 05:15:39 +0300
parents 3fcd7b4d631f
children b41ceead1708
line diff
     1.1 --- a/src/board.h	Mon Jun 22 05:05:37 2015 +0300
     1.2 +++ b/src/board.h	Mon Jun 22 05:15:39 2015 +0300
     1.3 @@ -2,7 +2,7 @@
     1.4  #define BOARD_H_
     1.5  
     1.6  #include <vector>
     1.7 -#include "mesh.h"
     1.8 +#include "object.h"
     1.9  
    1.10  #define NUM_SLOTS	24
    1.11  #define MAX_PUCKS	30
    1.12 @@ -12,8 +12,8 @@
    1.13  class Board {
    1.14  private:
    1.15  	int slots[NUM_SLOTS][MAX_PUCKS];
    1.16 -	std::vector<Mesh*> board_meshes;
    1.17 -	Mesh *puck_mesh;
    1.18 +	std::vector<Object*> obj;
    1.19 +	Object *puck_obj;
    1.20  
    1.21  	bool generate();
    1.22