diff --git a/Bin/DLL/DebugCameraVertex.cso b/Bin/DLL/DebugCameraVertex.cso index db8c9bce..b48c3e7c 100644 Binary files a/Bin/DLL/DebugCameraVertex.cso and b/Bin/DLL/DebugCameraVertex.cso differ diff --git a/Bin/DLL/DebugPixel.cso b/Bin/DLL/DebugPixel.cso index 8f2b274b..b70d1712 100644 Binary files a/Bin/DLL/DebugPixel.cso and b/Bin/DLL/DebugPixel.cso differ diff --git a/Bin/DLL/DebugVertex.cso b/Bin/DLL/DebugVertex.cso index eb211e78..a9c67dc0 100644 Binary files a/Bin/DLL/DebugVertex.cso and b/Bin/DLL/DebugVertex.cso differ diff --git a/Bin/DLL/GameLogic_x86D.exp b/Bin/DLL/GameLogic_x86D.exp new file mode 100644 index 00000000..514d3dda Binary files /dev/null and b/Bin/DLL/GameLogic_x86D.exp differ diff --git a/Bin/DLL/GameLogic_x86D.ilk b/Bin/DLL/GameLogic_x86D.ilk new file mode 100644 index 00000000..88495735 Binary files /dev/null and b/Bin/DLL/GameLogic_x86D.ilk differ diff --git a/Bin/DLL/GameLogic_x86D.pdb b/Bin/DLL/GameLogic_x86D.pdb new file mode 100644 index 00000000..10666b03 Binary files /dev/null and b/Bin/DLL/GameLogic_x86D.pdb differ diff --git a/Bin/DLL/GamePhysics_x86D.dll b/Bin/DLL/GamePhysics_x86D.dll index 81c50824..c370baa9 100644 Binary files a/Bin/DLL/GamePhysics_x86D.dll and b/Bin/DLL/GamePhysics_x86D.dll differ diff --git a/Bin/DLL/GamePhysics_x86D.exp b/Bin/DLL/GamePhysics_x86D.exp index 1c55aee9..81042824 100644 Binary files a/Bin/DLL/GamePhysics_x86D.exp and b/Bin/DLL/GamePhysics_x86D.exp differ diff --git a/Bin/DLL/GamePhysics_x86D.ilk b/Bin/DLL/GamePhysics_x86D.ilk index 132b6e7e..a7dbf2d7 100644 Binary files a/Bin/DLL/GamePhysics_x86D.ilk and b/Bin/DLL/GamePhysics_x86D.ilk differ diff --git a/Bin/DLL/GamePhysics_x86D.pdb b/Bin/DLL/GamePhysics_x86D.pdb index 8267f12b..f844c684 100644 Binary files a/Bin/DLL/GamePhysics_x86D.pdb and b/Bin/DLL/GamePhysics_x86D.pdb differ diff --git a/Bin/DLL/OysterGraphics_x86D.dll b/Bin/DLL/OysterGraphics_x86D.dll index ce514407..aca6d2ba 100644 Binary files a/Bin/DLL/OysterGraphics_x86D.dll and b/Bin/DLL/OysterGraphics_x86D.dll differ diff --git a/Bin/DLL/OysterGraphics_x86D.exp b/Bin/DLL/OysterGraphics_x86D.exp index 3679e007..efbd9ddd 100644 Binary files a/Bin/DLL/OysterGraphics_x86D.exp and b/Bin/DLL/OysterGraphics_x86D.exp differ diff --git a/Bin/DLL/OysterGraphics_x86D.ilk b/Bin/DLL/OysterGraphics_x86D.ilk index 8e111f12..f9a6a29e 100644 Binary files a/Bin/DLL/OysterGraphics_x86D.ilk and b/Bin/DLL/OysterGraphics_x86D.ilk differ diff --git a/Bin/DLL/OysterGraphics_x86D.pdb b/Bin/DLL/OysterGraphics_x86D.pdb index 2b032b64..6b7abac0 100644 Binary files a/Bin/DLL/OysterGraphics_x86D.pdb and b/Bin/DLL/OysterGraphics_x86D.pdb differ diff --git a/Bin/DLL/PixelGatherData.cso b/Bin/DLL/PixelGatherData.cso index 3ff8c1e0..fce9a8bd 100644 Binary files a/Bin/DLL/PixelGatherData.cso and b/Bin/DLL/PixelGatherData.cso differ diff --git a/Bin/DLL/VertexGatherData.cso b/Bin/DLL/VertexGatherData.cso index 45dd4a63..daf1087b 100644 Binary files a/Bin/DLL/VertexGatherData.cso and b/Bin/DLL/VertexGatherData.cso differ diff --git a/Code/GameLogic/DynamicObject.cpp b/Code/GameLogic/DynamicObject.cpp index 303f9e7d..ec175f59 100644 --- a/Code/GameLogic/DynamicObject.cpp +++ b/Code/GameLogic/DynamicObject.cpp @@ -14,3 +14,8 @@ DynamicObject::DynamicObject(void) DynamicObject::~DynamicObject(void) { } + +void DynamicObject::Update() +{ + //updatera objectet +} \ No newline at end of file diff --git a/Code/GameLogic/DynamicObject.h b/Code/GameLogic/DynamicObject.h index 5aa47d97..2d6ffdc8 100644 --- a/Code/GameLogic/DynamicObject.h +++ b/Code/GameLogic/DynamicObject.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef DYNAMICOBJECT_H #define DYNAMICOBJECT_H @@ -14,6 +19,8 @@ namespace GameLogic DynamicObject(void); ~DynamicObject(void); + void Update(); + }; } diff --git a/Code/GameLogic/GameMode.h b/Code/GameLogic/GameMode.h index 0187f4b7..42273946 100644 --- a/Code/GameLogic/GameMode.h +++ b/Code/GameLogic/GameMode.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef GAMEMODE_H #define GAMEMODE_H diff --git a/Code/GameLogic/IGame.h b/Code/GameLogic/IGame.h index 4d43a1e4..7e23936b 100644 --- a/Code/GameLogic/IGame.h +++ b/Code/GameLogic/IGame.h @@ -1,4 +1,6 @@ -// Game Logic interface +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// #ifndef IGAME_H #define IGAME_H diff --git a/Code/GameLogic/Level.h b/Code/GameLogic/Level.h index 6cfa50ee..b43f193d 100644 --- a/Code/GameLogic/Level.h +++ b/Code/GameLogic/Level.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef LEVEL_H #define LEVEL_H diff --git a/Code/GameLogic/Object.cpp b/Code/GameLogic/Object.cpp index e9c8db7a..7203eb94 100644 --- a/Code/GameLogic/Object.cpp +++ b/Code/GameLogic/Object.cpp @@ -1,5 +1,6 @@ #include "Object.h" #include "OysterMath.h" +#include "DllInterfaces\GFXAPI.h" using namespace GameLogic; @@ -11,53 +12,26 @@ using namespace Utility::DynamicMemory; Object::Object(void) { - model = new Model(); + model = new Oyster::Graphics::Model::Model(); + model = Oyster::Graphics::API::CreateModel(L"bth.obj"); - struct float4 - { - float x,y,z,w; - }; - - float4 mesh[] = - { - {-1.0f,1.0f,0.0f,1.0f}, - {1.0f,1.0f,0.0f,1.0f}, - {1.0f,-1.0f,0.0f,1.0f}, - }; - - Oyster::Graphics::Buffer::BUFFER_INIT_DESC desc; - desc.ElementSize= sizeof(float4); - desc.NumElements = 3; - desc.InitData=mesh; - desc.Type = Oyster::Graphics::Buffer::BUFFER_TYPE::VERTEX_BUFFER; - desc.Usage = Oyster::Graphics::Buffer::BUFFER_USAGE::BUFFER_USAGE_IMMUTABLE; - - Oyster::Graphics::Buffer *b = new Oyster::Graphics::Buffer(); - b->Init(desc); - - ModelInfo* modelInfo = new ModelInfo(); - modelInfo->Vertices = *b; - - modelInfo->Indexed = false; - modelInfo->VertexCount = 3; - - - Float4x4 matrix = Float4x4::identity; - - model->World = &matrix; - model->info = modelInfo; - model->Visible = true; + model->WorldMatrix *= 0.1f; + model->WorldMatrix.m44 = 1.0f; } Object::~Object(void) { - SAFE_DELETE(model->info); + } void Object::Render() { - model->info->Vertices.Apply(0); - Oyster::Graphics::Core::deviceContext->Draw(model->info->VertexCount,0); + Oyster::Graphics::API::RenderScene(model,1); +} + +void Object::Update() +{ + //dummy implementation that will be overloaded if the other class implements it in a different way } Object::OBJECT_TYPE Object::GetType() diff --git a/Code/GameLogic/Object.h b/Code/GameLogic/Object.h index 6ee07df5..1e0b5d99 100644 --- a/Code/GameLogic/Object.h +++ b/Code/GameLogic/Object.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef OBJECT_H #define OBJECT_H @@ -26,6 +31,7 @@ namespace GameLogic }; void Render(); + void Update(); OBJECT_TYPE GetType(); @@ -37,7 +43,7 @@ namespace GameLogic //rigidBody Utility::DynamicMemory::UniquePointer rigidBody; - Utility::DynamicMemory::UniquePointer model; + Utility::DynamicMemory::UniquePointer model; }; } diff --git a/Code/GameLogic/Player.h b/Code/GameLogic/Player.h index 39deb4b2..37a10fd2 100644 --- a/Code/GameLogic/Player.h +++ b/Code/GameLogic/Player.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef PLAYER_H #define PLAYER_H diff --git a/Code/GameLogic/RefManager.h b/Code/GameLogic/RefManager.h index 1aa51dc8..4ab0f1e4 100644 --- a/Code/GameLogic/RefManager.h +++ b/Code/GameLogic/RefManager.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef REFMANAGER_H #define REFMANAGER_H diff --git a/Code/GameLogic/StaticObject.h b/Code/GameLogic/StaticObject.h index 8637e460..07d23311 100644 --- a/Code/GameLogic/StaticObject.h +++ b/Code/GameLogic/StaticObject.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef STATICOBJECT_H #define STATICOBJECT_H diff --git a/Code/GameLogic/Weapon.h b/Code/GameLogic/Weapon.h index 72a335d4..e8d37a15 100644 --- a/Code/GameLogic/Weapon.h +++ b/Code/GameLogic/Weapon.h @@ -1,3 +1,8 @@ +////////////////////////////////////////////////// +//Created by Erik and Linda of the GameLogic team +////////////////////////////////////////////////// + + #ifndef WEAPON_H #define WEAPON_H diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj b/Code/OysterGraphics/OysterGraphics.vcxproj index 0f640874..09f743b7 100644 --- a/Code/OysterGraphics/OysterGraphics.vcxproj +++ b/Code/OysterGraphics/OysterGraphics.vcxproj @@ -149,7 +149,6 @@ - @@ -226,6 +225,8 @@ + + diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj.filters b/Code/OysterGraphics/OysterGraphics.vcxproj.filters index 7a556a5f..3bb4036f 100644 --- a/Code/OysterGraphics/OysterGraphics.vcxproj.filters +++ b/Code/OysterGraphics/OysterGraphics.vcxproj.filters @@ -1,102 +1,40 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - -<<<<<<< HEAD - -======= - ->>>>>>> origin/Graphics - Source Files - - - Source Files - -<<<<<<< HEAD - -======= - - Source Files - - - Source Files - - - Source Files - - ->>>>>>> origin/Graphics - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file