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

Do fix during weekend; Non stable

This commit is contained in:
lanariel 2013-11-22 15:18:52 +01:00
parent 205c58430f
commit abed0157ec
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Code/OysterGraphics/DllInterfaces/SimpleInterface.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <string>
#include "..\Model\Model.h" #include "..\Model\Model.h"
#include "OysterMath.h"
class SimpleInterface class SimpleInterface
@ -16,11 +18,11 @@ public:
State Init(HWND Window, bool MSAA_Quality, bool Fullscreen); State Init(HWND Window, bool MSAA_Quality, bool Fullscreen);
//! @brief from Oyster::Math Float4x4, expects corect methods //! @brief from Oyster::Math Float4x4, expects corect methods
static void NewFrame(float View[16], float Projection[16]); static void NewFrame(Oyster::Math::Float4x4 View, Oyster::Math::Float4x4 Projection);
static void RenderScene(Oyster::Graphics::Render::Model* models, int count); static void RenderScene(Oyster::Graphics::Render::Model* models, int count);
static void EndFrame(); static void EndFrame();
static Oyster::Graphics::Render::Model* CreateModel(); static Oyster::Graphics::Render::Model* CreateModel(std::wstring filename);
static State SetOptions(Option); static State SetOptions(Option);

1
Code/OysterGraphics/FileLoader/ObjReader.cpp
View File

@ -1,5 +1,6 @@
#include "OBJReader.h" #include "OBJReader.h"
#include "..\Definitions\GraphicalDefinition.h" #include "..\Definitions\GraphicalDefinition.h"
#include "..\Core\Buffer.h"
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>

3
Code/OysterGraphics/Model/Model.h
View File

@ -14,8 +14,7 @@ namespace Oyster
struct Model struct Model
{ {
typedef unsigned long long ModelData; void* const info;
ModelData info;
//ModelInfo* info; //ModelInfo* info;
void* data; void* data;
int size; int size;

1
Code/OysterGraphics/OysterGraphics.vcxproj
View File

@ -154,6 +154,7 @@
<ClInclude Include="Core\Buffer.h" /> <ClInclude Include="Core\Buffer.h" />
<ClInclude Include="Core\Core.h" /> <ClInclude Include="Core\Core.h" />
<ClInclude Include="Core\CoreIncludes.h" /> <ClInclude Include="Core\CoreIncludes.h" />
<ClInclude Include="DllInterfaces\SimpleInterface.h" />
<ClInclude Include="FileLoader\ObjReader.h" /> <ClInclude Include="FileLoader\ObjReader.h" />
<ClInclude Include="Model\Model.h" /> <ClInclude Include="Model\Model.h" />
<ClInclude Include="Model\ModelInfo.h" /> <ClInclude Include="Model\ModelInfo.h" />

3
Code/OysterGraphics/OysterGraphics.vcxproj.filters
View File

@ -71,6 +71,9 @@
<ClInclude Include="FileLoader\ObjReader.h"> <ClInclude Include="FileLoader\ObjReader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="DllInterfaces\SimpleInterface.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<FxCompile Include="Shader\HLSL\SimpleDebug\DebugVertex.hlsl" /> <FxCompile Include="Shader\HLSL\SimpleDebug\DebugVertex.hlsl" />