Skip to content

Commit 06355bd

Browse files
committed
Revert some changes by @eagleivg
1 parent 28ffb6a commit 06355bd

File tree

8 files changed

+15
-12
lines changed

8 files changed

+15
-12
lines changed

src/Include/editor/engine.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class property_holder_base;
1919
class engine_base
2020
{
2121
public:
22+
virtual bool on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result) = 0;
2223
virtual void on_idle() = 0;
2324
virtual void on_resize() = 0;
2425
virtual void pause(bool const& value) = 0;

src/xrCore/_std_extensions.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -216,21 +216,11 @@ inline int __cdecl xr_sprintf(char (&destination)[count], LPCSTR format_string,
216216
}
217217
#else // #ifndef MASTER_GOLD
218218

219-
inline int xr_strcpy(LPSTR destination, LPCSTR source)
220-
{
221-
return strcpy(destination, source);
222-
}
223-
224219
inline int xr_strcpy(LPSTR destination, size_t const destination_size, LPCSTR source)
225220
{
226221
return strncpy_s(destination, destination_size, source, destination_size);
227222
}
228223

229-
inline int xr_strcat(LPSTR destination, LPCSTR source)
230-
{
231-
return strcat(destination, source);
232-
}
233-
234224
inline int xr_strcat(LPSTR destination, size_t const buffer_size, LPCSTR source)
235225
{
236226
size_t const destination_length = xr_strlen(destination);

src/xrEngine/Device_Initialize.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ void CRenderDevice::initialize_weather_editor()
2222

2323
m_editor_finalize = (finalize_function_ptr)m_editor_module->GetProcAddress("finalize");
2424
VERIFY(m_editor_finalize);
25+
2526
m_engine = new engine_impl();
2627
m_editor_initialize(m_editor, m_engine);
2728
VERIFY(m_editor);

src/xrEngine/device.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ class ENGINE_API CRenderDevice : public CRenderDeviceBase
292292

293293
public:
294294
void xr_stdcall on_idle();
295+
bool xr_stdcall on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result);
295296

296297
private:
297298
void message_loop();

src/xrEngine/engine_impl.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ engine_impl::~engine_impl()
2626
xr_delete(m_input_receiver);
2727
}
2828

29+
bool engine_impl::on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result)
30+
{
31+
return (Device.on_message(hWnd, uMsg, wParam, lParam, result));
32+
}
33+
2934
void engine_impl::on_idle()
3035
{
3136
SDL_PumpEvents();

src/xrEngine/engine_impl.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class engine_impl : public XRay::Editor::engine_base
1818
virtual ~engine_impl();
1919

2020
private:
21+
virtual bool on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result);
2122
virtual void on_idle();
2223
virtual void on_resize();
2324
virtual void pause(bool const& value);

src/xrEngine/xrEngine.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@
295295
<ClCompile Include="Device_Initialize.cpp" />
296296
<ClCompile Include="Device_Misc.cpp" />
297297
<ClCompile Include="Device_overdraw.cpp" />
298+
<ClCompile Include="Device_wndproc.cpp" />
298299
<ClCompile Include="editor_environment_ambients_ambient.cpp" />
299300
<ClCompile Include="editor_environment_ambients_effect_id.cpp" />
300301
<ClCompile Include="editor_environment_ambients_manager.cpp" />
@@ -464,4 +465,4 @@
464465
<Error Condition="!Exists('..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets'))" />
465466
<Error Condition="!Exists('..\packages\sdl2.2.0.5\build\native\sdl2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.2.0.5\build\native\sdl2.targets'))" />
466467
</Target>
467-
</Project>
468+
</Project>

src/xrEngine/xrEngine.vcxproj.filters

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,9 @@
890890
<ClCompile Include="splash.cpp">
891891
<Filter>General</Filter>
892892
</ClCompile>
893+
<ClCompile Include="Device_wndproc.cpp">
894+
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
895+
</ClCompile>
893896
</ItemGroup>
894897
<ItemGroup>
895898
<Text Include="ClientServer.txt" />
@@ -903,4 +906,4 @@
903906
<ItemGroup>
904907
<None Include="packages.config" />
905908
</ItemGroup>
906-
</Project>
909+
</Project>

0 commit comments

Comments
 (0)