graphics/device 途中です…

diff --git a/roast_ex/include/roast/graphics/directx/dx9/idirect3d_device.hpp b/roast_ex/include/roast/graphics/directx/dx9/idirect3d_device.hpp
index f57bbcd..e51daca 100644 (file)
--- a/roast_ex/include/roast/graphics/directx/dx9/idirect3d_device.hpp
+++ b/roast_ex/include/roast/graphics/directx/dx9/idirect3d_device.hpp
@@ -4,6 +4,7 @@
 #define __SFJP_ROAST_EX__graphics__directx__dx9__idirect3d_device_HPP__
 
 #include "roast/graphics/directx/dx9/idirect3d.hpp"
+#include "roast/windows/window.hpp"
 
 namespace roast
 {
@@ -18,17 +19,16 @@ namespace roast
                                class device : public device_base, public iunknown_<idirect3d_device>
                                {
                                public:
+                                       template <int _DeviceModeN>
                                        device(first &f,
-                                               UINT Adapter,
-                                               D3DDEVTYPE DeviceType,
-                                               HWND hFocusWindow,
-                                               DWORD BehaviorFlags,
-                                               D3DPRESENT_PARAMETERS* pPresentationParameters)
+                                               const ::roast::windows::window &w,
+                                               const device_mode_<_DeviceModeN> &device_mode,
+                                               int adapter_no=0)
                                        {
                                                if ( pPresentationParameters == NULL )
                                                        throw exception("device::device() pPresentationParameters parametor should be not NULL.");
 
-                                               HRESULT hr = f.get_idirect3d_ptr()->CreateDevice( Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, &m_if );
+                                               HRESULT hr = f.get_idirect3d_ptr()->CreateDevice(adapter_no, DeviceType, w., BehaviorFlags, pPresentationParameters, &m_if );
                                                if ( hr != D3D_OK )
                                                        throw api_error("IDirect3D9::CreateDevice() Failed.", hr);
                                        }

diff --git a/roast_ex/test/dx9_test/dx9_test.cpp b/roast_ex/test/dx9_test/dx9_test.cpp
index 1e72f03..63fe098 100644 (file)
--- a/roast_ex/test/dx9_test/dx9_test.cpp
+++ b/roast_ex/test/dx9_test/dx9_test.cpp
@@ -1,4 +1,5 @@
 #include "roast/graphics/directx/dx9.hpp"
+#include "roast/windows/window.hpp"
 #include <stdio.h>
 
 using namespace ::roast::directx::dx9;
@@ -40,8 +41,14 @@ void main( void )
 
                /////////////////////////////////////////////////////////////////////////////////////
 
+               ::roast::windows::window w("Test");
+               w.start(NULL,NULL,"hoge",200,400);
+
                D3DPRESENT_PARAMETERS pp;
-               graphics::device d(f, 0, (D3DDEVTYPE)0, 0, 0, &pp);
+               pp.hDeviceWindow = w.get_hwnd();
+               pp.Windowed = TRUE;
+               ::roast::directx::device_mode::auto_;
+               graphics::device d(f, ::roast::directx::device_mode::auto_, w.get_hwnd(), 0, &pp);
        }
        catch( ::std::string &s )
        {

diff --git a/roast_ex/test/dx9_test/roast_test_3rd.vcproj b/roast_ex/test/dx9_test/roast_test_3rd.vcproj
index 2058bda..612d0ae 100644 (file)
--- a/roast_ex/test/dx9_test/roast_test_3rd.vcproj
+++ b/roast_ex/test/dx9_test/roast_test_3rd.vcproj
@@ -21,7 +21,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -94,7 +94,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
                        <Tool

diff --git a/roast_ex/test/windows_window_test/roast_test_3rd.vcproj b/roast_ex/test/windows_window_test/roast_test_3rd.vcproj
index a90ed7f..b17787c 100644 (file)
--- a/roast_ex/test/windows_window_test/roast_test_3rd.vcproj
+++ b/roast_ex/test/windows_window_test/roast_test_3rd.vcproj
@@ -174,10 +174,6 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File
-                               RelativePath=".\menu_test.cpp"
-                               >
-                       </File>
                </Filter>
                <Filter
                        Name="\83w\83b\83_\81[ \83t\83@\83C\83\8b"