demo map and weapon

This commit is contained in:
h4570
2022-07-31 16:24:46 +02:00
parent 834d57ea32
commit 12dd72f15e
28 changed files with 781 additions and 18 deletions
@@ -14,6 +14,7 @@
#include "math/m4x4.hpp"
#include "math/vec4.hpp"
#include "../pipeline_shading_type.hpp"
#include "../pipeline_texture_mapping_type.hpp"
namespace Tyra {
@@ -26,6 +27,7 @@ class PipelineInfoBag {
M4x4* model;
PipelineShadingType shadingType;
PipelineTextureMappingType textureMappingType;
bool blendingEnabled;
bool antiAliasingEnabled;
@@ -10,8 +10,9 @@
#pragma once
#include "renderer/3d/pipeline/shared/pipeline_shading_type.hpp"
#include "../shared/pipeline_shading_type.hpp"
#include "../shared/pipeline_lighting_options.hpp"
#include "../shared/pipeline_texture_mapping_type.hpp"
#include "./pipeline_frustum_culling.hpp"
namespace Tyra {
@@ -23,11 +24,13 @@ class PipelineOptions {
antiAliasingEnabled = false;
blendingEnabled = true;
shadingType = TyraShadingFlat;
textureMappingType = TyraLinear;
}
~PipelineOptions() {}
PipelineFrustumCulling frustumCulling;
PipelineShadingType shadingType;
PipelineTextureMappingType textureMappingType;
bool blendingEnabled;
bool antiAliasingEnabled;
@@ -0,0 +1,20 @@
/*
# ______ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
#pragma once
namespace Tyra {
enum PipelineTextureMappingType {
TyraNearest,
TyraLinear,
};
} // namespace Tyra