1fd6bbaa61f3827eb8e35aab191e22fcb4cef91a to 27af5fec1399dcf7a155f18f3e5513d57a8abc23 · sip / engine

proj/SkyXEngine/vs2013/SkyXEngine.sln

+17
−0

Original line number
Diff line number
Diff line

@@ -348,6 +348,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "freetype-2.10.0", "freetype

EndProject

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{4408F4BE-1F9D-4861-881A-AF9869C3D663}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xWindow", "..\..\xWindow\vs2013\xWindow.vcxproj", "{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Debug|Any CPU = Debug|Any CPU

@@ -979,6 +981,20 @@ Global

		{F0BA654B-EFF1-4F48-8ED5-4B1AA6888687}.Release|Win32.Build.0 = Release Static|Win32

		{F0BA654B-EFF1-4F48-8ED5-4B1AA6888687}.Release|x64.ActiveCfg = Release Static|x64

		{F0BA654B-EFF1-4F48-8ED5-4B1AA6888687}.Release|x64.Build.0 = Release Static|x64

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Debug|Any CPU.ActiveCfg = Debug|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Debug|Mixed Platforms.Build.0 = Debug|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Debug|Win32.ActiveCfg = Debug|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Debug|Win32.Build.0 = Debug|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Debug|x64.ActiveCfg = Debug|x64

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Debug|x64.Build.0 = Debug|x64

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Release|Any CPU.ActiveCfg = Release|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Release|Mixed Platforms.ActiveCfg = Release|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Release|Mixed Platforms.Build.0 = Release|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Release|Win32.ActiveCfg = Release|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Release|Win32.Build.0 = Release|Win32

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Release|x64.ActiveCfg = Release|x64

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}.Release|x64.Build.0 = Release|x64

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

@@ -1038,5 +1054,6 @@ Global

		{F0BA654B-EFF1-4F48-8ED5-4B1AA6888687} = {C3CAABF6-9239-4133-86E3-44DF79A67AF6}

		{C3CAABF6-9239-4133-86E3-44DF79A67AF6} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}

		{4408F4BE-1F9D-4861-881A-AF9869C3D663} = {E6B16854-D4A4-4B56-8E1C-482DD523F205}

		{16D78A7B-8EE9-4FD3-84C9-B71D8723E718} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}

	EndGlobalSection

EndGlobal

proj/xWindow/vs2013/xWindow.vcxproj0 → 100644

+189
−0

Original line number
Diff line number
Diff line

﻿<?xml version="1.0" encoding="utf-8"?>

<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup Label="ProjectConfigurations">

    <ProjectConfiguration Include="Debug|Win32">

      <Configuration>Debug</Configuration>

      <Platform>Win32</Platform>

    </ProjectConfiguration>

    <ProjectConfiguration Include="Debug|x64">

      <Configuration>Debug</Configuration>

      <Platform>x64</Platform>

    </ProjectConfiguration>

    <ProjectConfiguration Include="Release|Win32">

      <Configuration>Release</Configuration>

      <Platform>Win32</Platform>

    </ProjectConfiguration>

    <ProjectConfiguration Include="Release|x64">

      <Configuration>Release</Configuration>

      <Platform>x64</Platform>

    </ProjectConfiguration>

  </ItemGroup>

  <PropertyGroup Label="Globals">

    <ProjectGuid>{16D78A7B-8EE9-4FD3-84C9-B71D8723E718}</ProjectGuid>

    <Keyword>Win32Proj</Keyword>

    <RootNamespace>xWindow</RootNamespace>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>DynamicLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v120_xp</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

    <ConfigurationType>DynamicLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v120_xp</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>DynamicLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v120_xp</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

    <ConfigurationType>DynamicLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v120_xp</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <ImportGroup Label="ExtensionSettings">

  </ImportGroup>

  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <PropertyGroup Label="UserMacros" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <LinkIncremental>false</LinkIncremental>

    <OutDir>../../../build/bin/</OutDir>

    <TargetName>$(ProjectName)_d</TargetName>

    <SourcePath>$(VC_SourcePath);../../../source</SourcePath>

    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);../../../libs</LibraryPath>

    <IncludePath>$(VC_IncludePath);../../../sdks/;$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src</IncludePath>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

    <TargetName>$(ProjectName)_d</TargetName>

    <SourcePath>$(VC_SourcePath);../../../source</SourcePath>

    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);../../../libs64</LibraryPath>

    <IncludePath>$(VC_IncludePath);../../../sdks/;$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src</IncludePath>

    <LinkIncremental>false</LinkIncremental>

    <OutDir>../../../build/bin64/</OutDir>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <LinkIncremental>false</LinkIncremental>

    <OutDir>../../../build/bin/</OutDir>

    <IncludePath>$(VC_IncludePath);../../../sdks/;$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src</IncludePath>

    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);../../../libs</LibraryPath>

    <SourcePath>$(VC_SourcePath);../../../source</SourcePath>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

    <IncludePath>$(VC_IncludePath);../../../sdks/;$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src</IncludePath>

    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);../../../libs64</LibraryPath>

    <SourcePath>$(VC_SourcePath);../../../source</SourcePath>

    <LinkIncremental>false</LinkIncremental>

    <OutDir>../../../build/bin64/</OutDir>

  </PropertyGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <ClCompile>

      <PrecompiledHeader>

      </PrecompiledHeader>

      <WarningLevel>Level3</WarningLevel>

      <Optimization>Disabled</Optimization>

      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;SX_DLL;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);SX_LIB_NAME="xWnd"</PreprocessorDefinitions>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

      <TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary>

      <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>

      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

      <Profile>true</Profile>

    </Link>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

    <ClCompile>

      <PrecompiledHeader>

      </PrecompiledHeader>

      <WarningLevel>Level3</WarningLevel>

      <Optimization>Disabled</Optimization>

      <PreprocessorDefinitions>WIN64;_CRT_SECURE_NO_WARNINGS;SX_DLL;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);SX_LIB_NAME="xWnd"</PreprocessorDefinitions>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

      <TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary>

      <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>

      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

      <Profile>true</Profile>

    </Link>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <ClCompile>

      <WarningLevel>Level3</WarningLevel>

      <PrecompiledHeader>

      </PrecompiledHeader>

      <Optimization>MaxSpeed</Optimization>

      <FunctionLevelLinking>true</FunctionLevelLinking>

      <IntrinsicFunctions>true</IntrinsicFunctions>

      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;SX_DLL;%(PreprocessorDefinitions);SX_LIB_NAME="xWnd"</PreprocessorDefinitions>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

      <TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <EnableCOMDATFolding>true</EnableCOMDATFolding>

      <OptimizeReferences>true</OptimizeReferences>

      <ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary>

      <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>

    </Link>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

    <ClCompile>

      <WarningLevel>Level3</WarningLevel>

      <PrecompiledHeader>

      </PrecompiledHeader>

      <Optimization>MaxSpeed</Optimization>

      <FunctionLevelLinking>true</FunctionLevelLinking>

      <IntrinsicFunctions>true</IntrinsicFunctions>

      <PreprocessorDefinitions>WIN64;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;SX_DLL;%(PreprocessorDefinitions);SX_LIB_NAME="xWnd"</PreprocessorDefinitions>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

      <TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <EnableCOMDATFolding>true</EnableCOMDATFolding>

      <OptimizeReferences>true</OptimizeReferences>

      <ImportLibrary>../../../libs64/$(TargetName).lib</ImportLibrary>

      <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>

    </Link>

  </ItemDefinitionGroup>

  <ItemGroup>

    <ClInclude Include="..\..\..\source\xWindow\xWindow.h" />

  </ItemGroup>

  <ItemGroup>

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

  </ImportGroup>

</Project>

 No newline at end of file

proj/xWindow/vs2013/xWindow.vcxproj.filters0 → 100644

+24
−0

Original line number
Diff line number
Diff line

﻿<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

    <Filter Include="Source Files">

      <UniqueIdentifier>{502BFA85-C352-4398-9B09-CAF7C9F9E808}</UniqueIdentifier>

      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

    </Filter>

    <Filter Include="Header Files">

      <UniqueIdentifier>{CA8442FD-9C12-4B8D-941B-42042DBEB0C9}</UniqueIdentifier>

      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>

    </Filter>

    <Filter Include="Resource Files">

      <UniqueIdentifier>{AEFC3A70-0D9D-424F-9405-F7335C1E27AB}</UniqueIdentifier>

      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

    </Filter>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\..\..\source\xWindow\xWindow.h">

      <Filter>Header Files</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

  </ItemGroup>

</Project>

 No newline at end of file

common @ 2a6e6705

Compare 7c47ff01 to 2a6e6705

Original line number
Diff line number
Diff line

Subproject commit 7c47ff01efd00fd301c9e0b538698147cd8bf7ec

Subproject commit 2a6e670568d82f84ac13dab3e0d3ba1f3f5b62d8

source/game/EditorObject.cpp

+2
−0

Original line number
Diff line number
Diff line

@@ -177,6 +177,8 @@ void CEditorObject::create()

	assert(!m_pEntity);

	m_pEntity = CREATE_ENTITY(m_szClassName, GameData::m_pMgr);

	m_pEntity->setFlags(m_pEntity->getFlags() | EF_LEVEL | EF_EXPORT);

	setPos(getPos());

	setOrient(getOrient());

	setScale(getScale());

source/light/light.cpp

+1
−0

Original line number
Diff line number
Diff line

@@ -1650,6 +1650,7 @@ void CXLight::setColor(const float3 &vColor)

		return;

	}

	m_vColor = vColor;

	m_isVSDataDirty = true;

	m_isPSDataDirty = true;

}

source/terrax/CommandDelete.cpp

+7
−5

Original line number
Diff line number
Diff line

@@ -20,6 +20,13 @@ bool CCommandDelete::undo()

	{

		pObj = &m_aObjects[i];

		pObj->pObject->create();

		pObj->pObject->setPos(pObj->vPos);

		pObj->pObject->setScale(pObj->vScale);

		pObj->pObject->setOrient(pObj->qRotate);

		pObj->pObject->preSetup();

		for(auto i = pObj->mKeyValues.begin(); i; i++)

		{

@@ -27,11 +34,6 @@ bool CCommandDelete::undo()

		}

		pObj->pObject->postSetup();

		pObj->pObject->setPos(pObj->vPos);

		pObj->pObject->setScale(pObj->vScale);

		pObj->pObject->setOrient(pObj->qRotate);

		pObj->pObject->create();

		for(UINT i = g_pLevelObjects.size(); i > pObj->idObject; --i)

		{

			g_pLevelObjects[i] = g_pLevelObjects[i - 1];

source/xWindow/xWindow.h0 → 100644

+74
−0

Original line number
Diff line number
Diff line

#ifndef __XWINDOW_H

#define __XWINDOW_H

#include <gdefines.h>

enum XWINDOW_FLAG

{

	XWF_DEFAULT = 0x0000,

	XWF_NOBORDER = 0x0001,

	XWF_BUTTON_CLOSE = 0x0002,

	XWF_BUTTON_MINMAX = 0x0004,

	XWF_TRANSPARENT = 0x0008,

	XWF_NORESIZE = 0x0010

};

DEFINE_ENUM_FLAG_OPERATORS(XWINDOW_FLAG);

#define XCW_USEDEFAULT ((int)0x80000000)

struct XWINDOW_DESC

{

	UINT uSizeX;

	UINT uSizeY;

	UINT uPosX = XCW_USEDEFAULT;

	UINT uPosY = XCW_USEDEFAULT;

	XWINDOW_FLAG flags = XWF_DEFAULT;

	const char *szTitle;

};

//#############################################################################

class IXWindow: public IXUnknown

{

public:

	//! 

	virtual XWINDOW_OS_HANDLE* XMETHODCALLTYPE getOSHandle() = 0;

	//! Скрывает окно (остается в таскбаре)

	virtual void XMETHODCALLTYPE hide() = 0;

	//! Закрывает окно (исчезает из таскбара)

	virtual void XMETHODCALLTYPE close() = 0;

	//! Открывает окно

	virtual void XMETHODCALLTYPE show() = 0;

	//! Видимо ли окно (открыто и не свернуто)

	virtual void XMETHODCALLTYPE isVisible() = 0;

	//! 

	virtual void XMETHODCALLTYPE setTitle(const char *szTitle) = 0;

	//! 

	virtual void XMETHODCALLTYPE update(const XWINDOW_DESC *pWindowDesc) = 0;

	//! 

	virtual INT_PTR XMETHODCALLTYPE runDefaultCallback(UINT msg, WPARAM wParam, LPARAM lParam) = 0;

};

class IXWindowCallback

{

public:

	virtual INT_PTR XMETHODCALLTYPE onMessage(UINT msg, WPARAM wParam, LPARAM lParam, IXWindow *pWindow) = 0;

};

class IXWindowSystem: public IXUnknown

{

	//! 

	virtual IXWindow* XMETHODCALLTYPE createWindow(const XWINDOW_DESC *pWindowDesc, IXWindowCallback *pCallback = NULL, IXWindow *pParent = NULL) = 0;

	//! 

	virtual bool XMETHODCALLTYPE processMessages(UINT uMaxMessages = 0) = 0;

};

#endif

Compare revisions

Source

Target

Commits on Source 2

Files

proj/SkyXEngine/vs2013/SkyXEngine.sln

proj/xWindow/vs2013/xWindow.vcxproj

proj/xWindow/vs2013/xWindow.vcxproj.filters

common @ 2a6e6705

source/game/EditorObject.cpp

source/light/light.cpp

source/terrax/CommandDelete.cpp

source/xWindow/xWindow.h