diff --git a/Camera Renderer.sln b/Camera Renderer.sln
index a68adff..1f58b7c 100644
--- a/Camera Renderer.sln
+++ b/Camera Renderer.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.31702.278
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Camera Renderer CS", "Camera-Renderer_cs\Camera Renderer CS.csproj", "{33A294C7-3146-405C-BCCA-C4E36985D0D7}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Camera Renderer C++", "Camera-Renderer_cpp\CameraDirect_cpp.vcxproj", "{E764711A-933E-4E87-A081-2C24B25F7699}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
@@ -41,6 +43,30 @@ Global
{33A294C7-3146-405C-BCCA-C4E36985D0D7}.Release|x86.ActiveCfg = Release|x86
{33A294C7-3146-405C-BCCA-C4E36985D0D7}.Release|x86.Build.0 = Release|x86
{33A294C7-3146-405C-BCCA-C4E36985D0D7}.Release|x86.Deploy.0 = Release|x86
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|ARM.ActiveCfg = Debug|ARM
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|ARM.Build.0 = Debug|ARM
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|ARM.Deploy.0 = Debug|ARM
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|ARM64.Build.0 = Debug|ARM64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|x64.ActiveCfg = Debug|x64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|x64.Build.0 = Debug|x64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|x64.Deploy.0 = Debug|x64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|x86.ActiveCfg = Debug|Win32
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|x86.Build.0 = Debug|Win32
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Debug|x86.Deploy.0 = Debug|Win32
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|ARM.ActiveCfg = Release|ARM
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|ARM.Build.0 = Release|ARM
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|ARM.Deploy.0 = Release|ARM
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|ARM64.ActiveCfg = Release|ARM64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|ARM64.Build.0 = Release|ARM64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|ARM64.Deploy.0 = Release|ARM64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|x64.ActiveCfg = Release|x64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|x64.Build.0 = Release|x64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|x64.Deploy.0 = Release|x64
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|x86.ActiveCfg = Release|Win32
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|x86.Build.0 = Release|Win32
+ {E764711A-933E-4E87-A081-2C24B25F7699}.Release|x86.Deploy.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Camera-Renderer_cpp/App.xaml b/Camera-Renderer_cpp/App.xaml
index 8feaded..cdbb828 100644
--- a/Camera-Renderer_cpp/App.xaml
+++ b/Camera-Renderer_cpp/App.xaml
@@ -1,7 +1,7 @@
+ xmlns:local="using:CameraRenderer_cpp">
diff --git a/Camera-Renderer_cpp/App.xaml.cpp b/Camera-Renderer_cpp/App.xaml.cpp
index ae855dd..3f5dcf5 100644
--- a/Camera-Renderer_cpp/App.xaml.cpp
+++ b/Camera-Renderer_cpp/App.xaml.cpp
@@ -6,7 +6,7 @@
#include "pch.h"
#include "DirectXPage.xaml.h"
-using namespace CameraDirect_cpp;
+using namespace CameraRenderer_cpp;
using namespace Platform;
using namespace Windows::ApplicationModel;
diff --git a/Camera-Renderer_cpp/App.xaml.h b/Camera-Renderer_cpp/App.xaml.h
index 0672c22..fe559fe 100644
--- a/Camera-Renderer_cpp/App.xaml.h
+++ b/Camera-Renderer_cpp/App.xaml.h
@@ -8,7 +8,7 @@
#include "App.g.h"
#include "DirectXPage.xaml.h"
-namespace CameraDirect_cpp
+namespace CameraRenderer_cpp
{
///
/// Provides application-specific behavior to supplement the default Application class.
diff --git a/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj b/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj
index 73bbeb8..5f0e4f8 100644
--- a/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj
+++ b/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj
@@ -46,6 +46,7 @@
10.0.17763.0
10.0
false
+ Camera Renderer C++
@@ -128,7 +129,6 @@
-
d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)
@@ -138,9 +138,9 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- _DEBUG;%(PreprocessorDefinitions)
+ _DEBUG;%(PreprocessorDefinitions)
@@ -152,9 +152,9 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- NDEBUG;%(PreprocessorDefinitions)
+ NDEBUG;%(PreprocessorDefinitions)
@@ -166,9 +166,9 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- _DEBUG;%(PreprocessorDefinitions)
+ _DEBUG;%(PreprocessorDefinitions)
@@ -180,9 +180,9 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- NDEBUG;%(PreprocessorDefinitions)
+ NDEBUG;%(PreprocessorDefinitions)
@@ -194,9 +194,9 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- _DEBUG;%(PreprocessorDefinitions)
+ _DEBUG;%(PreprocessorDefinitions)
@@ -208,9 +208,9 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- NDEBUG;%(PreprocessorDefinitions)
+ NDEBUG;%(PreprocessorDefinitions)
@@ -222,9 +222,9 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- _DEBUG;%(PreprocessorDefinitions)
+ _DEBUG;%(PreprocessorDefinitions)
@@ -236,12 +236,11 @@
pch.h
$(IntDir)pch.pch
$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories)
- /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
4453;28204
- NDEBUG;%(PreprocessorDefinitions)
+ NDEBUG;%(PreprocessorDefinitions)
-
@@ -257,13 +256,13 @@
-
+
DirectXPage.xaml
-
+
@@ -272,11 +271,11 @@
App.xaml
-
-
+
+
DirectXPage.xaml
-
+
Create
@@ -316,4 +315,4 @@
-
+
\ No newline at end of file
diff --git a/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj.filters b/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj.filters
index 5b6d723..3651fad 100644
--- a/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj.filters
+++ b/Camera-Renderer_cpp/CameraDirect_cpp.vcxproj.filters
@@ -8,13 +8,13 @@
9a29d315-3729-42f1-8e9a-441e0ca09644
bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png
-
+
e15b4174-702d-4f9c-b6c9-a413728a0086
Common
-
+
Common
@@ -23,7 +23,7 @@
Common
-
+
Content
@@ -32,13 +32,13 @@
Content
-
+
Content
Content
-
+
Content
@@ -63,4 +63,26 @@
Assets
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Assets
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Camera-Renderer_cpp/CameraDirect_cppMain.cpp b/Camera-Renderer_cpp/CameraDirect_cppMain.cpp
index 9f551a7..5778ed2 100644
--- a/Camera-Renderer_cpp/CameraDirect_cppMain.cpp
+++ b/Camera-Renderer_cpp/CameraDirect_cppMain.cpp
@@ -2,13 +2,13 @@
#include "CameraDirect_cppMain.h"
#include "Common\DirectXHelper.h"
-using namespace CameraDirect_cpp;
+using namespace CameraRenderer_cpp;
using namespace Windows::Foundation;
using namespace Windows::System::Threading;
using namespace Concurrency;
// Loads and initializes application assets when the application is loaded.
-CameraDirect_cppMain::CameraDirect_cppMain(const std::shared_ptr& deviceResources) :
+CameraRenderer_cppMain::CameraRenderer_cppMain(const std::shared_ptr& deviceResources) :
m_deviceResources(deviceResources), m_pointerLocationX(0.0f)
{
// Register to be notified if the Device is lost or recreated
@@ -27,20 +27,20 @@ CameraDirect_cppMain::CameraDirect_cppMain(const std::shared_ptrRegisterDeviceNotify(nullptr);
}
// Updates application state when the window size changes (e.g. device orientation change)
-void CameraDirect_cppMain::CreateWindowSizeDependentResources()
+void CameraRenderer_cppMain::CreateWindowSizeDependentResources()
{
// TODO: Replace this with the size-dependent initialization of your app's content.
m_sceneRenderer->CreateWindowSizeDependentResources();
}
-void CameraDirect_cppMain::StartRenderLoop()
+void CameraRenderer_cppMain::StartRenderLoop()
{
// If the animation render loop is already running then do not start another thread.
if (m_renderLoopWorker != nullptr && m_renderLoopWorker->Status == AsyncStatus::Started)
@@ -67,13 +67,13 @@ void CameraDirect_cppMain::StartRenderLoop()
m_renderLoopWorker = ThreadPool::RunAsync(workItemHandler, WorkItemPriority::High, WorkItemOptions::TimeSliced);
}
-void CameraDirect_cppMain::StopRenderLoop()
+void CameraRenderer_cppMain::StopRenderLoop()
{
m_renderLoopWorker->Cancel();
}
// Updates the application state once per frame.
-void CameraDirect_cppMain::Update()
+void CameraRenderer_cppMain::Update()
{
ProcessInput();
@@ -87,7 +87,7 @@ void CameraDirect_cppMain::Update()
}
// Process all input from the user before updating game state
-void CameraDirect_cppMain::ProcessInput()
+void CameraRenderer_cppMain::ProcessInput()
{
// TODO: Add per frame input handling here.
m_sceneRenderer->TrackingUpdate(m_pointerLocationX);
@@ -95,7 +95,7 @@ void CameraDirect_cppMain::ProcessInput()
// Renders the current frame according to the current application state.
// Returns true if the frame was rendered and is ready to be displayed.
-bool CameraDirect_cppMain::Render()
+bool CameraRenderer_cppMain::Render()
{
// Don't try to render anything before the first Update.
if (m_timer.GetFrameCount() == 0)
@@ -126,14 +126,14 @@ bool CameraDirect_cppMain::Render()
}
// Notifies renderers that device resources need to be released.
-void CameraDirect_cppMain::OnDeviceLost()
+void CameraRenderer_cppMain::OnDeviceLost()
{
m_sceneRenderer->ReleaseDeviceDependentResources();
m_fpsTextRenderer->ReleaseDeviceDependentResources();
}
// Notifies renderers that device resources may now be recreated.
-void CameraDirect_cppMain::OnDeviceRestored()
+void CameraRenderer_cppMain::OnDeviceRestored()
{
m_sceneRenderer->CreateDeviceDependentResources();
m_fpsTextRenderer->CreateDeviceDependentResources();
diff --git a/Camera-Renderer_cpp/CameraDirect_cppMain.h b/Camera-Renderer_cpp/CameraDirect_cppMain.h
index 6f95fdd..43c2c83 100644
--- a/Camera-Renderer_cpp/CameraDirect_cppMain.h
+++ b/Camera-Renderer_cpp/CameraDirect_cppMain.h
@@ -6,13 +6,13 @@
#include "Content\SampleFpsTextRenderer.h"
// Renders Direct2D and 3D content on the screen.
-namespace CameraDirect_cpp
+namespace CameraRenderer_cpp
{
- class CameraDirect_cppMain : public DX::IDeviceNotify
+ class CameraRenderer_cppMain : public DX::IDeviceNotify
{
public:
- CameraDirect_cppMain(const std::shared_ptr& deviceResources);
- ~CameraDirect_cppMain();
+ CameraRenderer_cppMain(const std::shared_ptr& deviceResources);
+ ~CameraRenderer_cppMain();
void CreateWindowSizeDependentResources();
void StartTracking() { m_sceneRenderer->StartTracking(); }
void TrackingUpdate(float positionX) { m_pointerLocationX = positionX; }
diff --git a/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.cpp b/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.cpp
index 7ad5abf..c54363a 100644
--- a/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.cpp
+++ b/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.cpp
@@ -3,7 +3,7 @@
#include "..\Common\DirectXHelper.h"
-using namespace CameraDirect_cpp;
+using namespace CameraRenderer_cpp;
using namespace DirectX;
using namespace Windows::Foundation;
diff --git a/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.h b/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.h
index aae2e32..0883af7 100644
--- a/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.h
+++ b/Camera-Renderer_cpp/Content/Sample3DSceneRenderer.h
@@ -4,7 +4,7 @@
#include "ShaderStructures.h"
#include "..\Common\StepTimer.h"
-namespace CameraDirect_cpp
+namespace CameraRenderer_cpp
{
// This sample renderer instantiates a basic rendering pipeline.
class Sample3DSceneRenderer
diff --git a/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.cpp b/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.cpp
index 751158e..be2004f 100644
--- a/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.cpp
+++ b/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.cpp
@@ -3,7 +3,7 @@
#include "Common/DirectXHelper.h"
-using namespace CameraDirect_cpp;
+using namespace CameraRenderer_cpp;
using namespace Microsoft::WRL;
// Initializes D2D resources used for text rendering.
diff --git a/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.h b/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.h
index 5115a15..5d56655 100644
--- a/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.h
+++ b/Camera-Renderer_cpp/Content/SampleFpsTextRenderer.h
@@ -4,7 +4,7 @@
#include "..\Common\DeviceResources.h"
#include "..\Common\StepTimer.h"
-namespace CameraDirect_cpp
+namespace CameraRenderer_cpp
{
// Renders the current FPS value in the bottom right corner of the screen using Direct2D and DirectWrite.
class SampleFpsTextRenderer
diff --git a/Camera-Renderer_cpp/Content/ShaderStructures.h b/Camera-Renderer_cpp/Content/ShaderStructures.h
index 87b7585..b63dd12 100644
--- a/Camera-Renderer_cpp/Content/ShaderStructures.h
+++ b/Camera-Renderer_cpp/Content/ShaderStructures.h
@@ -1,6 +1,6 @@
#pragma once
-namespace CameraDirect_cpp
+namespace CameraRenderer_cpp
{
// Constant buffer used to send MVP matrices to the vertex shader.
struct ModelViewProjectionConstantBuffer
diff --git a/Camera-Renderer_cpp/DirectXPage.xaml b/Camera-Renderer_cpp/DirectXPage.xaml
index b10f3dc..a28540f 100644
--- a/Camera-Renderer_cpp/DirectXPage.xaml
+++ b/Camera-Renderer_cpp/DirectXPage.xaml
@@ -1,8 +1,8 @@
(new CameraDirect_cppMain(m_deviceResources));
+ m_main = std::unique_ptr(new CameraRenderer_cppMain(m_deviceResources));
m_main->StartRenderLoop();
}
diff --git a/Camera-Renderer_cpp/DirectXPage.xaml.h b/Camera-Renderer_cpp/DirectXPage.xaml.h
index 9f2244c..fbfef99 100644
--- a/Camera-Renderer_cpp/DirectXPage.xaml.h
+++ b/Camera-Renderer_cpp/DirectXPage.xaml.h
@@ -10,7 +10,7 @@
#include "Common\DeviceResources.h"
#include "CameraDirect_cppMain.h"
-namespace CameraDirect_cpp
+namespace CameraRenderer_cpp
{
///
/// A page that hosts a DirectX SwapChainPanel.
@@ -52,7 +52,7 @@ namespace CameraDirect_cpp
// Resources used to render the DirectX content in the XAML page background.
std::shared_ptr m_deviceResources;
- std::unique_ptr m_main;
+ std::unique_ptr m_main;
bool m_windowVisible;
};
}
diff --git a/Camera-Renderer_cpp/Package.appxmanifest b/Camera-Renderer_cpp/Package.appxmanifest
index acc3c19..e7d7a4e 100644
--- a/Camera-Renderer_cpp/Package.appxmanifest
+++ b/Camera-Renderer_cpp/Package.appxmanifest
@@ -14,7 +14,7 @@
- CameraDirect_cpp
+ CameraRenderer_cpp
Brych
Assets\StoreLogo.png
@@ -30,12 +30,12 @@
+ EntryPoint="CameraRenderer_cpp.App">