kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PipelineInfo::CullMode and PipelineInfo::RasterMode are no longer within the PipelineInfo class, enabling easier forward declaration.

Browse Source 
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:
Kearwood Gilbert
2022-07-07 22:51:16 -07:00
parent 4f3b8ad584
commit 216cbe3eec
56 changed files with 315 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kraken/KRMaterial.h
View File

@@ -29,6 +29,10 @@
// or implied, of Kearwood Gilbert.
//
#pragma once
#include "KREngine-common.h"
#include "KRTexture.h"
@@ -39,10 +43,8 @@
#include "KRScene.h"
#include "KRBone.h"
#ifndef KRMATERIAL_H
#define KRMATERIAL_H
enum class CullMode : __uint32_t;
enum class ModelFormat : __uint8_t;
class KRTextureManager;
class KRContext;
@@ -83,7 +85,7 @@ public:
bool isTransparent();
const std::string &getName() const;
bool bind(const KRNode::RenderInfo& ri, const std::vector<KRBone*>& bones, const std::vector<Matrix4>& bind_poses, const Matrix4& matModel, KRTexture* pLightMap, const Vector3& rim_color, float rim_power, float lod_coverage = 0.0f);
void bind(const KRNode::RenderInfo& ri, ModelFormat modelFormat, __uint32_t vertexAttributes, CullMode cullMode, const std::vector<KRBone*>& bones, const std::vector<Matrix4>& bind_poses, const Matrix4& matModel, KRTexture* pLightMap, const Vector3& rim_color, float rim_power, float lod_coverage = 0.0f);
bool needsVertexTangents();
@@ -134,5 +136,3 @@ private:
void getTextures();
};
#endif