BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes

Browse Source
This commit is contained in:
Tleety
2016-03-09 17:24:21 +01:00
parent 49040e9c4b
commit 1104166039
21 changed files with 9375 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/SpriteJob.h
+3 -2
View File
@@ -7,6 +7,7 @@
#include "../GLM.h"
#include "../Core/ComponentWrapper.h"
#include "Texture.h"
#include "TextureSprite.h"
#include "Model.h"
#include "RenderJob.h"
#include "../Core/ResourceManager.h"
@@ -24,9 +25,9 @@ struct SpriteJob : RenderJob
::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
TextureID = 0;
DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
StartIndex = matProp.material->StartIndex;
EndIndex = matProp.material->EndIndex;