NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2d Almost working

This commit is contained in:
lanariel 2014-02-07 13:47:09 +01:00
parent 9a0f363146
commit d9133f459a
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
View File

@ -163,7 +163,7 @@ namespace Oyster
void API::RenderGuiElement(API::Texture tex, Math::Float2 pos, Math::Float2 size) void API::RenderGuiElement(API::Texture tex, Math::Float2 pos, Math::Float2 size)
{ {
Render::Rendering::Gui::Render((ID3D11Texture2D*)tex,pos,size); Render::Rendering::Gui::Render((ID3D11ShaderResourceView*)tex,pos,size);
} }
API::Texture API::CreateTexture(std::wstring filename) API::Texture API::CreateTexture(std::wstring filename)

39
Code/OysterGraphics/Render/Rendering/GuiRender.cpp
View File

@ -1,4 +1,6 @@
#include "GuiRender.h" #include "GuiRender.h"
#include "../Resources/Deffered.h"
#include "../../Definitions/GraphicalDefinition.h"
namespace Oyster namespace Oyster
{ {
@ -12,31 +14,28 @@ namespace Oyster
{ {
} }
void Gui::Render(ID3D11Texture2D* tex,Math::Float2 pos, Math::Float2 size) void Gui::Render(ID3D11ShaderResourceView* tex,Math::Float2 pos, Math::Float2 size)
{ {
//Oyster::Core::DeviceContext->PSSetShaderResources(0,1,&srv); Core::deviceContext->PSSetShaderResources(0,1,&tex);
//Pos.x -= instance.sizeX/2; pos *= 2;
//Pos.x += size.x/2; pos -= 1;
pos.y *= -1;
//Pos.y -= instance.sizeY/2; Definitions::GuiData gd;
//Pos.y += size.y/2;
//Matrix m; gd.Translation = Math::Matrix::identity;
//m = Math::Matrix::identity; gd.Translation.m41 = pos.x;
//float width = (1.0f/(instance.sizeX/2.0f)); gd.Translation.m42 = pos.y;
//float height = (1.0f/(instance.sizeY/2.0f)); gd.Translation.m11 = size.x;
//m.m41=Pos.x * width; gd.Translation.m22 = size.y;
//m.m42=-Pos.y * height;
//m.m43=Pos.z;
//m.m11=width*size.x/2;
//m.m22=height*size.y/2;
//void* dest = Resources::Buffers::CBufferGs.Map();
//memcpy(dest,&m.GetTranspose(),64);
//Resources::Buffers::CBufferGs.Unmap();
//Oyster::Core::DeviceContext->Draw(1,0);
void* data = Render::Resources::Deffered::GuiData.Map();
memcpy(data,&gd,sizeof(gd));
Render::Resources::Deffered::GuiData.Unmap();
Core::deviceContext->Draw(1,0);
} }
} }
} }

2
Code/OysterGraphics/Render/Rendering/GuiRender.h
View File

@ -14,7 +14,7 @@ namespace Oyster
{ {
public: public:
static void BeginRender(); static void BeginRender();
static void Render(ID3D11Texture2D* tex, Math::Float2 pos, Math::Float2 size); static void Render(ID3D11ShaderResourceView* tex, Math::Float2 pos, Math::Float2 size);
}; };
} }
} }