Commit 4447aa73 authored by Ilya Prokhorov's avatar Ilya Prokhorov

Shared lib changes

parent 7aeef223
......@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
project (FlameSteelCommonTraits)
set(CMAKE_BUILD_TYPE Release)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src /usr/local/include/FlameSteelFramework)
file(GLOB_RECURSE SOURCE_FILES
"src/FlameSteelCommonTraits/*.cpp"
......
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
/*
* File: FSGLMaterial.cpp
* Author: demensdeum
*
* Created on July 31, 2017, 10:36 PM
*/
#include "Material.h"
FSGLMaterial::FSGLMaterial(shared_ptr<string> texturePath) {
this->texturePath = texturePath;
}
FSGLMaterial::FSGLMaterial(SDL_Surface *surface) {
this->surface = surface;
}
FSGLMaterial::FSGLMaterial(const FSGLMaterial& ) {
}
FSGLMaterial::~FSGLMaterial() {
if (surface != NULL) {
SDL_FreeSurface(surface);
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
/*
* File: FSGLMaterial.h
* Author: demensdeum
*
* Created on July 31, 2017, 10:36 PM
*/
#ifndef FSGLMATERIAL_H
#define FSGLMATERIAL_H
#include <memory>
#include <string>
#include <SDL2/SDL.h>
using namespace std;
class FSGLMaterial {
public:
FSGLMaterial(shared_ptr<string> texturePath);
FSGLMaterial(SDL_Surface *surface);
FSGLMaterial(const FSGLMaterial& orig);
virtual ~FSGLMaterial();
shared_ptr<string> texturePath;
SDL_Surface *surface = nullptr;
bool needsUpdate = false;
private:
};
#endif /* FSGLMATERIAL_H */
#include "SerializedModel.h"
FSEGTSerializedModel::FSEGTSerializedModel(shared_ptr<string> serializedModel) {
this->serializedModel = serializedModel;
}
\ No newline at end of file
#ifndef FSEGTSERIALIZEDMODELDEFINED
#define FSEGTSERIALIZEDMODELDEFINED
#include <FlameSteelCore/Object.h>
using namespace FlameSteelCore;
class FSEGTSerializedModel: public Object {
public:
FSEGTSerializedModel(shared_ptr<string> serializedModel);
shared_ptr<string> serializedModel;
};
#endif
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment