PipelineInfo::CullMode and PipelineInfo::RasterMode are no longer within the PipelineInfo class, enabling easier forward declaration.
KRMaterial::bind now accepts remaining parameters required to set up the pipeline. Removed GL calls from KRModel. Replaced ifdef guards with pragma once. KRMesh::model_format_t changed to ModelFormat and is no longer within KRMesh, enabling easier forward declaration.
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
// or implied, of Kearwood Gilbert.
|
||||
//
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "KREngine-common.h"
|
||||
|
||||
@@ -43,9 +44,6 @@ using std::vector;
|
||||
|
||||
#include "KRPipeline.h"
|
||||
|
||||
#ifndef KRPIPELINEMANAGER_H
|
||||
#define KRPIPELINEMANAGER_H
|
||||
|
||||
class KRPipeline;
|
||||
class PipelineInfo;
|
||||
class KRCamera;
|
||||
@@ -67,5 +65,3 @@ private:
|
||||
typedef std::map<std::pair<std::string, std::vector<int> >, KRPipeline*> PipelineMap;
|
||||
PipelineMap m_pipelines;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user