reworked JLoader as JSON_Loader, will require rework of rest of obj model

This commit is contained in:
Chris Punches
2017-06-08 23:49:13 -04:00
parent 245ee4323a
commit 9fe2d4923a
37 changed files with 854 additions and 1034 deletions

View File

@@ -1,17 +1,12 @@
//
// Created by phanes on 4/22/17.
//
#ifndef FTESTS_UNITS_H
#define FTESTS_UNITS_H
#include <vector>
#include "../json/json.h"
#include "JLoader.h"
#include "JSON_Loader.h"
#include "Unit.h"
class Suite: public JLoader
class Suite: public JSON_Loader
{
private:
std::vector<Unit> units;
@@ -19,11 +14,11 @@ class Suite: public JLoader
public:
// constructor
Suite( std::string filename );
Suite();
int load_file( std::string filename );
// returns the unit type identified by name or null
Unit get_unit(std::string provided_name);
};
#endif //FTESTS_UNITS_H