Skip to content
Snippets Groups Projects
Commit 8c496b5f authored by D-AIRY's avatar D-AIRY
Browse files

Инициализация физики

parent 54012ee7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 512 additions and 1 deletion
proj/SkyXEngine/vs2013/SkyXEngine.sln
+ 137
− 0
View file @ 8c496b5f
...@@ -5,6 +5,7 @@ VisualStudioVersion = 12.0.21005.1 ...@@ -5,6 +5,7 @@ VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkyXEngine", "SkyXEngine.vcxproj", "{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkyXEngine", "SkyXEngine.vcxproj", "{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E} = {7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}
{C1C1F046-C839-4602-AF70-923CDD237C1B} = {C1C1F046-C839-4602-AF70-923CDD237C1B} {C1C1F046-C839-4602-AF70-923CDD237C1B} = {C1C1F046-C839-4602-AF70-923CDD237C1B}
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73} = {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73} {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73} = {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}
{2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D} = {2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D} {2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D} = {2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}
...@@ -66,68 +67,194 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxmaterialeditor", "..\..\s ...@@ -66,68 +67,194 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxmaterialeditor", "..\..\s
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxconsole", "..\..\sxconsole\vs2013\sxconsole.vcxproj", "{CEFD4247-0B36-4268-B455-C1E826173005}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxconsole", "..\..\sxconsole\vs2013\sxconsole.vcxproj", "{CEFD4247-0B36-4268-B455-C1E826173005}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bullet", "Bullet", "{6376944C-E417-43FD-8B56-073A310EB7D9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bullet3Collision", "..\..\..\sdks\bullet3\build3\vs2010\Bullet3Collision.vcxproj", "{A57B87BE-C63D-C64F-A06E-C48B4723C51A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bullet3Common", "..\..\..\sdks\bullet3\build3\vs2010\Bullet3Common.vcxproj", "{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bullet3Dynamics", "..\..\..\sdks\bullet3\build3\vs2010\Bullet3Dynamics.vcxproj", "{D6ECE531-C294-BC42-8C32-6F09F1240325}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bullet3Geometry", "..\..\..\sdks\bullet3\build3\vs2010\Bullet3Geometry.vcxproj", "{60A46FEB-576C-7B40-A047-D6079D9D66C4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bullet3OpenCL_clew", "..\..\..\sdks\bullet3\build3\vs2010\Bullet3OpenCL_clew.vcxproj", "{A690CE26-63ED-6C4E-8406-C494AED4C073}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxphysics", "..\..\sxphysics\vs2013\sxphysics.vcxproj", "{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}"
ProjectSection(ProjectDependencies) = postProject
{C1C1F046-C839-4602-AF70-923CDD237C1B} = {C1C1F046-C839-4602-AF70-923CDD237C1B}
{46A17C83-2972-4C41-B67F-224640089085} = {46A17C83-2972-4C41-B67F-224640089085}
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F} = {E74F00B5-7DC5-DC48-8E91-D1C2296F455F}
{072A60D2-317A-CC41-AD12-7E381235064A} = {072A60D2-317A-CC41-AD12-7E381235064A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BulletDynamics", "..\..\..\sdks\bullet3\build3\vs2010\BulletDynamics.vcxproj", "{072A60D2-317A-CC41-AD12-7E381235064A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BulletCollision", "..\..\..\sdks\bullet3\build3\vs2010\BulletCollision.vcxproj", "{46A17C83-2972-4C41-B67F-224640089085}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LinearMath", "..\..\..\sdks\bullet3\build3\vs2010\LinearMath.vcxproj", "{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Debug|Win32.ActiveCfg = Debug|Win32 {97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Debug|Win32.ActiveCfg = Debug|Win32
{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Debug|Win32.Build.0 = Debug|Win32 {97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Debug|Win32.Build.0 = Debug|Win32
{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Debug|x64.ActiveCfg = Debug|Win32
{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Release|Win32.ActiveCfg = Release|Win32 {97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Release|Win32.ActiveCfg = Release|Win32
{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Release|Win32.Build.0 = Release|Win32 {97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Release|Win32.Build.0 = Release|Win32
{97D8EE94-0A6D-47F2-BE01-63F7C89715BC}.Release|x64.ActiveCfg = Release|Win32
{C1C1F046-C839-4602-AF70-923CDD237C1B}.Debug|Win32.ActiveCfg = Debug|Win32 {C1C1F046-C839-4602-AF70-923CDD237C1B}.Debug|Win32.ActiveCfg = Debug|Win32
{C1C1F046-C839-4602-AF70-923CDD237C1B}.Debug|Win32.Build.0 = Debug|Win32 {C1C1F046-C839-4602-AF70-923CDD237C1B}.Debug|Win32.Build.0 = Debug|Win32
{C1C1F046-C839-4602-AF70-923CDD237C1B}.Debug|x64.ActiveCfg = Debug|Win32
{C1C1F046-C839-4602-AF70-923CDD237C1B}.Release|Win32.ActiveCfg = Release|Win32 {C1C1F046-C839-4602-AF70-923CDD237C1B}.Release|Win32.ActiveCfg = Release|Win32
{C1C1F046-C839-4602-AF70-923CDD237C1B}.Release|Win32.Build.0 = Release|Win32 {C1C1F046-C839-4602-AF70-923CDD237C1B}.Release|Win32.Build.0 = Release|Win32
{C1C1F046-C839-4602-AF70-923CDD237C1B}.Release|x64.ActiveCfg = Release|Win32
{AEECC2DB-C7C7-4089-9262-A69794DF834D}.Debug|Win32.ActiveCfg = Debug|Win32 {AEECC2DB-C7C7-4089-9262-A69794DF834D}.Debug|Win32.ActiveCfg = Debug|Win32
{AEECC2DB-C7C7-4089-9262-A69794DF834D}.Debug|Win32.Build.0 = Debug|Win32 {AEECC2DB-C7C7-4089-9262-A69794DF834D}.Debug|Win32.Build.0 = Debug|Win32
{AEECC2DB-C7C7-4089-9262-A69794DF834D}.Debug|x64.ActiveCfg = Debug|Win32
{AEECC2DB-C7C7-4089-9262-A69794DF834D}.Release|Win32.ActiveCfg = Release|Win32 {AEECC2DB-C7C7-4089-9262-A69794DF834D}.Release|Win32.ActiveCfg = Release|Win32
{AEECC2DB-C7C7-4089-9262-A69794DF834D}.Release|Win32.Build.0 = Release|Win32 {AEECC2DB-C7C7-4089-9262-A69794DF834D}.Release|Win32.Build.0 = Release|Win32
{AEECC2DB-C7C7-4089-9262-A69794DF834D}.Release|x64.ActiveCfg = Release|Win32
{0C7E3DB7-005F-41E9-A570-868BCF959E91}.Debug|Win32.ActiveCfg = Debug|Win32 {0C7E3DB7-005F-41E9-A570-868BCF959E91}.Debug|Win32.ActiveCfg = Debug|Win32
{0C7E3DB7-005F-41E9-A570-868BCF959E91}.Debug|Win32.Build.0 = Debug|Win32 {0C7E3DB7-005F-41E9-A570-868BCF959E91}.Debug|Win32.Build.0 = Debug|Win32
{0C7E3DB7-005F-41E9-A570-868BCF959E91}.Debug|x64.ActiveCfg = Debug|Win32
{0C7E3DB7-005F-41E9-A570-868BCF959E91}.Release|Win32.ActiveCfg = Release|Win32 {0C7E3DB7-005F-41E9-A570-868BCF959E91}.Release|Win32.ActiveCfg = Release|Win32
{0C7E3DB7-005F-41E9-A570-868BCF959E91}.Release|Win32.Build.0 = Release|Win32 {0C7E3DB7-005F-41E9-A570-868BCF959E91}.Release|Win32.Build.0 = Release|Win32
{0C7E3DB7-005F-41E9-A570-868BCF959E91}.Release|x64.ActiveCfg = Release|Win32
{3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Debug|Win32.ActiveCfg = Debug|Win32 {3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Debug|Win32.ActiveCfg = Debug|Win32
{3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Debug|Win32.Build.0 = Debug|Win32 {3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Debug|Win32.Build.0 = Debug|Win32
{3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Debug|x64.ActiveCfg = Debug|Win32
{3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Release|Win32.ActiveCfg = Release|Win32 {3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Release|Win32.ActiveCfg = Release|Win32
{3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Release|Win32.Build.0 = Release|Win32 {3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Release|Win32.Build.0 = Release|Win32
{3A5449A3-DCE7-4557-9C9F-DEEAFBAAC763}.Release|x64.ActiveCfg = Release|Win32
{2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Debug|Win32.ActiveCfg = Debug|Win32 {2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Debug|Win32.ActiveCfg = Debug|Win32
{2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Debug|Win32.Build.0 = Debug|Win32 {2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Debug|Win32.Build.0 = Debug|Win32
{2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Debug|x64.ActiveCfg = Debug|Win32
{2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Release|Win32.ActiveCfg = Release|Win32 {2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Release|Win32.ActiveCfg = Release|Win32
{2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Release|Win32.Build.0 = Release|Win32 {2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Release|Win32.Build.0 = Release|Win32
{2B3BA583-D5EC-4DC2-91CF-42B1C7ADFD9D}.Release|x64.ActiveCfg = Release|Win32
{BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Debug|Win32.ActiveCfg = Debug|Win32 {BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Debug|Win32.ActiveCfg = Debug|Win32
{BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Debug|Win32.Build.0 = Debug|Win32 {BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Debug|Win32.Build.0 = Debug|Win32
{BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Debug|x64.ActiveCfg = Debug|Win32
{BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Release|Win32.ActiveCfg = Release|Win32 {BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Release|Win32.ActiveCfg = Release|Win32
{BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Release|Win32.Build.0 = Release|Win32 {BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Release|Win32.Build.0 = Release|Win32
{BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE}.Release|x64.ActiveCfg = Release|Win32
{0292BE32-298E-4E18-BC42-5A39F9487EBA}.Debug|Win32.ActiveCfg = Debug|Win32 {0292BE32-298E-4E18-BC42-5A39F9487EBA}.Debug|Win32.ActiveCfg = Debug|Win32
{0292BE32-298E-4E18-BC42-5A39F9487EBA}.Debug|Win32.Build.0 = Debug|Win32 {0292BE32-298E-4E18-BC42-5A39F9487EBA}.Debug|Win32.Build.0 = Debug|Win32
{0292BE32-298E-4E18-BC42-5A39F9487EBA}.Debug|x64.ActiveCfg = Debug|Win32
{0292BE32-298E-4E18-BC42-5A39F9487EBA}.Release|Win32.ActiveCfg = Release|Win32 {0292BE32-298E-4E18-BC42-5A39F9487EBA}.Release|Win32.ActiveCfg = Release|Win32
{0292BE32-298E-4E18-BC42-5A39F9487EBA}.Release|Win32.Build.0 = Release|Win32 {0292BE32-298E-4E18-BC42-5A39F9487EBA}.Release|Win32.Build.0 = Release|Win32
{0292BE32-298E-4E18-BC42-5A39F9487EBA}.Release|x64.ActiveCfg = Release|Win32
{6A3341BF-710B-4310-A7F8-810040D698DC}.Debug|Win32.ActiveCfg = Debug|Win32 {6A3341BF-710B-4310-A7F8-810040D698DC}.Debug|Win32.ActiveCfg = Debug|Win32
{6A3341BF-710B-4310-A7F8-810040D698DC}.Debug|Win32.Build.0 = Debug|Win32 {6A3341BF-710B-4310-A7F8-810040D698DC}.Debug|Win32.Build.0 = Debug|Win32
{6A3341BF-710B-4310-A7F8-810040D698DC}.Debug|x64.ActiveCfg = Debug|Win32
{6A3341BF-710B-4310-A7F8-810040D698DC}.Release|Win32.ActiveCfg = Release|Win32 {6A3341BF-710B-4310-A7F8-810040D698DC}.Release|Win32.ActiveCfg = Release|Win32
{6A3341BF-710B-4310-A7F8-810040D698DC}.Release|Win32.Build.0 = Release|Win32 {6A3341BF-710B-4310-A7F8-810040D698DC}.Release|Win32.Build.0 = Release|Win32
{6A3341BF-710B-4310-A7F8-810040D698DC}.Release|x64.ActiveCfg = Release|Win32
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Debug|Win32.ActiveCfg = Debug|Win32 {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Debug|Win32.ActiveCfg = Debug|Win32
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Debug|Win32.Build.0 = Debug|Win32 {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Debug|Win32.Build.0 = Debug|Win32
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Debug|x64.ActiveCfg = Debug|Win32
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Release|Win32.ActiveCfg = Release|Win32 {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Release|Win32.ActiveCfg = Release|Win32
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Release|Win32.Build.0 = Release|Win32 {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Release|Win32.Build.0 = Release|Win32
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}.Release|x64.ActiveCfg = Release|Win32
{AFBF200A-9260-4469-AE64-DCB42C796DD6}.Debug|Win32.ActiveCfg = Debug|Win32 {AFBF200A-9260-4469-AE64-DCB42C796DD6}.Debug|Win32.ActiveCfg = Debug|Win32
{AFBF200A-9260-4469-AE64-DCB42C796DD6}.Debug|Win32.Build.0 = Debug|Win32 {AFBF200A-9260-4469-AE64-DCB42C796DD6}.Debug|Win32.Build.0 = Debug|Win32
{AFBF200A-9260-4469-AE64-DCB42C796DD6}.Debug|x64.ActiveCfg = Debug|Win32
{AFBF200A-9260-4469-AE64-DCB42C796DD6}.Release|Win32.ActiveCfg = Release|Win32 {AFBF200A-9260-4469-AE64-DCB42C796DD6}.Release|Win32.ActiveCfg = Release|Win32
{AFBF200A-9260-4469-AE64-DCB42C796DD6}.Release|Win32.Build.0 = Release|Win32 {AFBF200A-9260-4469-AE64-DCB42C796DD6}.Release|Win32.Build.0 = Release|Win32
{AFBF200A-9260-4469-AE64-DCB42C796DD6}.Release|x64.ActiveCfg = Release|Win32
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Debug|Win32.ActiveCfg = Debug|Win32 {A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Debug|Win32.ActiveCfg = Debug|Win32
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Debug|Win32.Build.0 = Debug|Win32 {A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Debug|Win32.Build.0 = Debug|Win32
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Debug|x64.ActiveCfg = Debug|Win32
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Release|Win32.ActiveCfg = Release|Win32 {A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Release|Win32.ActiveCfg = Release|Win32
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Release|Win32.Build.0 = Release|Win32 {A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Release|Win32.Build.0 = Release|Win32
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE}.Release|x64.ActiveCfg = Release|Win32
{9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Debug|Win32.ActiveCfg = Debug|Win32 {9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Debug|Win32.ActiveCfg = Debug|Win32
{9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Debug|Win32.Build.0 = Debug|Win32 {9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Debug|Win32.Build.0 = Debug|Win32
{9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Debug|x64.ActiveCfg = Debug|Win32
{9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Release|Win32.ActiveCfg = Release|Win32 {9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Release|Win32.ActiveCfg = Release|Win32
{9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Release|Win32.Build.0 = Release|Win32 {9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Release|Win32.Build.0 = Release|Win32
{9C34362D-7FA6-4BD1-A48B-8FDE541344B0}.Release|x64.ActiveCfg = Release|Win32
{CEFD4247-0B36-4268-B455-C1E826173005}.Debug|Win32.ActiveCfg = Debug|Win32 {CEFD4247-0B36-4268-B455-C1E826173005}.Debug|Win32.ActiveCfg = Debug|Win32
{CEFD4247-0B36-4268-B455-C1E826173005}.Debug|Win32.Build.0 = Debug|Win32 {CEFD4247-0B36-4268-B455-C1E826173005}.Debug|Win32.Build.0 = Debug|Win32
{CEFD4247-0B36-4268-B455-C1E826173005}.Debug|x64.ActiveCfg = Debug|Win32
{CEFD4247-0B36-4268-B455-C1E826173005}.Release|Win32.ActiveCfg = Release|Win32 {CEFD4247-0B36-4268-B455-C1E826173005}.Release|Win32.ActiveCfg = Release|Win32
{CEFD4247-0B36-4268-B455-C1E826173005}.Release|Win32.Build.0 = Release|Win32 {CEFD4247-0B36-4268-B455-C1E826173005}.Release|Win32.Build.0 = Release|Win32
{CEFD4247-0B36-4268-B455-C1E826173005}.Release|x64.ActiveCfg = Release|Win32
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Debug|Win32.ActiveCfg = Debug|Win32
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Debug|Win32.Build.0 = Debug|Win32
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Debug|x64.ActiveCfg = Debug|x64
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Debug|x64.Build.0 = Debug|x64
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Release|Win32.ActiveCfg = Release|Win32
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Release|Win32.Build.0 = Release|Win32
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Release|x64.ActiveCfg = Release|x64
{A57B87BE-C63D-C64F-A06E-C48B4723C51A}.Release|x64.Build.0 = Release|x64
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Debug|Win32.ActiveCfg = Debug|Win32
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Debug|Win32.Build.0 = Debug|Win32
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Debug|x64.ActiveCfg = Debug|x64
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Debug|x64.Build.0 = Debug|x64
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Release|Win32.ActiveCfg = Release|Win32
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Release|Win32.Build.0 = Release|Win32
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Release|x64.ActiveCfg = Release|x64
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA}.Release|x64.Build.0 = Release|x64
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Debug|Win32.ActiveCfg = Debug|Win32
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Debug|Win32.Build.0 = Debug|Win32
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Debug|x64.ActiveCfg = Debug|x64
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Debug|x64.Build.0 = Debug|x64
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Release|Win32.ActiveCfg = Release|Win32
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Release|Win32.Build.0 = Release|Win32
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Release|x64.ActiveCfg = Release|x64
{D6ECE531-C294-BC42-8C32-6F09F1240325}.Release|x64.Build.0 = Release|x64
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Debug|Win32.ActiveCfg = Debug|Win32
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Debug|Win32.Build.0 = Debug|Win32
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Debug|x64.ActiveCfg = Debug|x64
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Debug|x64.Build.0 = Debug|x64
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Release|Win32.ActiveCfg = Release|Win32
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Release|Win32.Build.0 = Release|Win32
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Release|x64.ActiveCfg = Release|x64
{60A46FEB-576C-7B40-A047-D6079D9D66C4}.Release|x64.Build.0 = Release|x64
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Debug|Win32.ActiveCfg = Debug|Win32
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Debug|Win32.Build.0 = Debug|Win32
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Debug|x64.ActiveCfg = Debug|x64
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Debug|x64.Build.0 = Debug|x64
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Release|Win32.ActiveCfg = Release|Win32
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Release|Win32.Build.0 = Release|Win32
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Release|x64.ActiveCfg = Release|x64
{A690CE26-63ED-6C4E-8406-C494AED4C073}.Release|x64.Build.0 = Release|x64
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}.Debug|Win32.ActiveCfg = Debug|Win32
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}.Debug|Win32.Build.0 = Debug|Win32
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}.Debug|x64.ActiveCfg = Debug|Win32
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}.Release|Win32.ActiveCfg = Release|Win32
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}.Release|Win32.Build.0 = Release|Win32
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}.Release|x64.ActiveCfg = Release|Win32
{072A60D2-317A-CC41-AD12-7E381235064A}.Debug|Win32.ActiveCfg = Debug|Win32
{072A60D2-317A-CC41-AD12-7E381235064A}.Debug|Win32.Build.0 = Debug|Win32
{072A60D2-317A-CC41-AD12-7E381235064A}.Debug|x64.ActiveCfg = Debug|x64
{072A60D2-317A-CC41-AD12-7E381235064A}.Debug|x64.Build.0 = Debug|x64
{072A60D2-317A-CC41-AD12-7E381235064A}.Release|Win32.ActiveCfg = Release|Win32
{072A60D2-317A-CC41-AD12-7E381235064A}.Release|Win32.Build.0 = Release|Win32
{072A60D2-317A-CC41-AD12-7E381235064A}.Release|x64.ActiveCfg = Release|x64
{072A60D2-317A-CC41-AD12-7E381235064A}.Release|x64.Build.0 = Release|x64
{46A17C83-2972-4C41-B67F-224640089085}.Debug|Win32.ActiveCfg = Debug|Win32
{46A17C83-2972-4C41-B67F-224640089085}.Debug|Win32.Build.0 = Debug|Win32
{46A17C83-2972-4C41-B67F-224640089085}.Debug|x64.ActiveCfg = Debug|x64
{46A17C83-2972-4C41-B67F-224640089085}.Debug|x64.Build.0 = Debug|x64
{46A17C83-2972-4C41-B67F-224640089085}.Release|Win32.ActiveCfg = Release|Win32
{46A17C83-2972-4C41-B67F-224640089085}.Release|Win32.Build.0 = Release|Win32
{46A17C83-2972-4C41-B67F-224640089085}.Release|x64.ActiveCfg = Release|x64
{46A17C83-2972-4C41-B67F-224640089085}.Release|x64.Build.0 = Release|x64
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Debug|Win32.ActiveCfg = Debug|Win32
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Debug|Win32.Build.0 = Debug|Win32
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Debug|x64.ActiveCfg = Debug|x64
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Debug|x64.Build.0 = Debug|x64
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Release|Win32.ActiveCfg = Release|Win32
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Release|Win32.Build.0 = Release|Win32
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Release|x64.ActiveCfg = Release|x64
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -141,10 +268,20 @@ Global ...@@ -141,10 +268,20 @@ Global
{BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC} {BA779DCC-93C8-4FB7-BBB9-A7D2F76C35DE} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{0292BE32-298E-4E18-BC42-5A39F9487EBA} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC} {0292BE32-298E-4E18-BC42-5A39F9487EBA} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC} {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{6376944C-E417-43FD-8B56-073A310EB7D9} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{6A3341BF-710B-4310-A7F8-810040D698DC} = {5128FBE9-1706-4255-B422-4A652320085E} {6A3341BF-710B-4310-A7F8-810040D698DC} = {5128FBE9-1706-4255-B422-4A652320085E}
{AFBF200A-9260-4469-AE64-DCB42C796DD6} = {5128FBE9-1706-4255-B422-4A652320085E} {AFBF200A-9260-4469-AE64-DCB42C796DD6} = {5128FBE9-1706-4255-B422-4A652320085E}
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE} = {5128FBE9-1706-4255-B422-4A652320085E} {A2B9EACA-69C1-4E9D-AF3C-704608DB57DE} = {5128FBE9-1706-4255-B422-4A652320085E}
{9C34362D-7FA6-4BD1-A48B-8FDE541344B0} = {5128FBE9-1706-4255-B422-4A652320085E} {9C34362D-7FA6-4BD1-A48B-8FDE541344B0} = {5128FBE9-1706-4255-B422-4A652320085E}
{CEFD4247-0B36-4268-B455-C1E826173005} = {5128FBE9-1706-4255-B422-4A652320085E} {CEFD4247-0B36-4268-B455-C1E826173005} = {5128FBE9-1706-4255-B422-4A652320085E}
{A57B87BE-C63D-C64F-A06E-C48B4723C51A} = {6376944C-E417-43FD-8B56-073A310EB7D9}
{EF2EC91D-F2A6-BD43-89AC-8054F3D5EECA} = {6376944C-E417-43FD-8B56-073A310EB7D9}
{D6ECE531-C294-BC42-8C32-6F09F1240325} = {6376944C-E417-43FD-8B56-073A310EB7D9}
{60A46FEB-576C-7B40-A047-D6079D9D66C4} = {6376944C-E417-43FD-8B56-073A310EB7D9}
{A690CE26-63ED-6C4E-8406-C494AED4C073} = {6376944C-E417-43FD-8B56-073A310EB7D9}
{072A60D2-317A-CC41-AD12-7E381235064A} = {6376944C-E417-43FD-8B56-073A310EB7D9}
{46A17C83-2972-4C41-B67F-224640089085} = {6376944C-E417-43FD-8B56-073A310EB7D9}
{E74F00B5-7DC5-DC48-8E91-D1C2296F455F} = {6376944C-E417-43FD-8B56-073A310EB7D9}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal
proj/sxphysics/vs2013/sxphysics.vcxproj 0 → 100644
+ 100
− 0
View file @ 8c496b5f
<?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="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>sxphysics</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>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120_xp</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</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 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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>../../../build/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/bullet3/bin;../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/bullet3/bin;../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SX_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;SXPHYSICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SX_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;SXPHYSICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\sxphysics\PhyWorld.cpp" />
<ClCompile Include="..\..\..\source\sxphysics\sxphysics_dll.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\sxphysics\PhyWorld.h" />
<ClInclude Include="..\..\..\source\sxphysics\sxphysics.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
proj/sxphysics/vs2013/sxphysics.vcxproj.filters 0 → 100644
+ 33
− 0
View file @ 8c496b5f
<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</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>
<ClCompile Include="..\..\..\source\sxphysics\sxphysics_dll.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\sxphysics\PhyWorld.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\sxphysics\sxphysics.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\sxphysics\PhyWorld.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
source/SkyXEngine.h
+ 8
− 1
View file @ 8c496b5f
...@@ -232,3 +232,10 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот ...@@ -232,3 +232,10 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот
#pragma comment(lib, "sxanim.lib") #pragma comment(lib, "sxanim.lib")
#endif #endif
#include <sxanim/sxanim.h> #include <sxanim/sxanim.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxphysics_d.lib")
#else
#pragma comment(lib, "sxphysics.lib")
#endif
#include <sxphysics/sxphysics.h>
source/skyxengine.cpp
+ 5
− 0
View file @ 8c496b5f
...@@ -74,6 +74,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLin ...@@ -74,6 +74,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLin
SXAnim_0Create(); SXAnim_0Create();
SXAnim_Dbg_Set(printflog); SXAnim_Dbg_Set(printflog);
SXPhysics_0Create();
SXPhysics_Dbg_Set(printflog);
SPP_RTSetInput(SML_DSGetRT_ID(DS_RT::ds_rt_scene_light_com)); SPP_RTSetInput(SML_DSGetRT_ID(DS_RT::ds_rt_scene_light_com));
SPP_RTSetOutput(SML_DSGetRT_ID(DS_RT::ds_rt_scene_light_com2)); SPP_RTSetOutput(SML_DSGetRT_ID(DS_RT::ds_rt_scene_light_com2));
SPP_RTSetDepth0(SML_DSGetRT_ID(DS_RT::ds_rt_depth0)); SPP_RTSetDepth0(SML_DSGetRT_ID(DS_RT::ds_rt_depth0));
...@@ -164,11 +167,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLin ...@@ -164,11 +167,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLin
} }
} }
SXPhysics_0Kill();
SXAnim_0Kill(); SXAnim_0Kill();
mem_release(GData::ObjCamera); mem_release(GData::ObjCamera);
SGeom_0CreateKill(); SGeom_0CreateKill();
SML_0Kill(); SML_0Kill();
SGCore_0Kill(); SGCore_0Kill();
Core_AKill();
return msg.wParam; return msg.wParam;
} }
\ No newline at end of file
source/sxphysics/PhyWorld.cpp 0 → 100644
+ 47
− 0
View file @ 8c496b5f
#include "PhyWorld.h"
#include <core/sxcore.h>
PhyWorld::PhyWorld()
{
printf("Initializing physics engine... ");
m_pBroadphase = new btDbvtBroadphase();
m_pCollisionConfiguration = new btDefaultCollisionConfiguration();
m_pDispatcher = new btCollisionDispatcher(m_pCollisionConfiguration);
m_pSolver = new btSequentialImpulseConstraintSolver;
m_pGHostPairCallback = new btGhostPairCallback();
m_pBroadphase->getOverlappingPairCache()->setInternalGhostPairCallback(m_pGHostPairCallback);
m_pDynamicsWorld = new btDiscreteDynamicsWorld(m_pDispatcher, m_pBroadphase, m_pSolver, m_pCollisionConfiguration);
Core_0RegisterCVarString("phy_world_gravity", "0 -10 0", "World gravity (x y z)");
//m_pDebugDrawer = new DebugDrawer();
//m_pDebugDrawer->setDebugMode(btIDebugDraw::DBG_DrawWireframe);
//m_pDebugDrawer->setDebugMode(btIDebugDraw::DBG_FastWireframe);
//m_pDynamicsWorld->setDebugDrawer(m_pDebugDrawer);
Core_0RegisterCVarBool("phy_debugdraw", false, "Debug drawing physics shapes");
m_bDebugDraw = GET_PCVAR_BOOL("phy_debugdraw");
printf("Done!\n");
}
PhyWorld::~PhyWorld()
{
mem_delete(m_pDynamicsWorld);
mem_delete(m_pGHostPairCallback);
mem_delete(m_pSolver);
mem_delete(m_pDispatcher);
mem_delete(m_pCollisionConfiguration);
mem_delete(m_pBroadphase);
}
void PhyWorld::SetThreadNum(int tnum)
{
}
void PhyWorld::Update(int thread)
{
}
void PhyWorld::Sync()
{
}
\ No newline at end of file
source/sxphysics/PhyWorld.h 0 → 100644
+ 31
− 0
View file @ 8c496b5f
#ifndef SXPHYWORLD_H
#define SXPHYWORLD_H
#include <btBulletDynamicsCommon.h>
#include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <BulletDynamics/Character/btKinematicCharacterController.h>
class PhyWorld
{
public:
PhyWorld();
~PhyWorld();
void SetThreadNum(int tnum);
void Update(int thread = 0);
void Sync();
protected:
btDefaultCollisionConfiguration * m_pCollisionConfiguration;
btCollisionDispatcher * m_pDispatcher;
btBroadphaseInterface * m_pBroadphase;
btSequentialImpulseConstraintSolver * m_pSolver;
btDiscreteDynamicsWorld * m_pDynamicsWorld;
btGhostPairCallback * m_pGHostPairCallback;
const bool * m_bDebugDraw;
};
#endif
source/sxphysics/sxphysics.h 0 → 100644
+ 52
− 0
View file @ 8c496b5f

/******************************************************
Copyright © Vitaliy Buturlin, Evgeny Danilovich, 2017
See the license in LICENSE
******************************************************/
/*!
\file
Заголовочный файл sxphysics - библиотека физики
*/
/*! \defgroup sxphysics sxphysics - библиотека физики
@{
*/
#ifndef _SXPHYSICS_H_
#define _SXPHYSICS_H_
#include <gdefines.h>
/*! Инициализирует библиотеку
*/
SX_LIB_API void SXPhysics_0Create();
/*! Деинициализирует библиотеку
*/
SX_LIB_API void SXPhysics_0Kill();
/*! Устанавливает функцию сообщений
*/
SX_LIB_API void SXPhysics_Dbg_Set(report_func rf);
/*! Устанавливает количество потоков обновления физики
*/
SX_LIB_API void SXPhysics_UpdateSetThreadNum(int num);
/*! Выполняет обновление физики
@param[in] thread Номер потока, выполняющего обновление
*/
SX_LIB_API void SXPhysics_Update(int thread = 0);
/*! Выполняет синхронизацию. Для многопоточного обновления
*/
SX_LIB_API void SXPhysics_Sync();
#endif
/*! @} */
source/sxphysics/sxphysics_dll.cpp 0 → 100644
+ 99
− 0
View file @ 8c496b5f
/******************************************************
Copyright Vitaliy Buturlin, Evgeny Danilovich, 2017
See the license in LICENSE
******************************************************/
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include "sxphysics.h"
#include "PhyWorld.h"
#include <core/sxcore.h>
//..\..\bin\BulletDynamics_vs2010_debug.lib;..\..\bin\BulletCollision_vs2010_debug.lib;..\..\bin\LinearMath_vs2010_debug.lib;
#if defined(_DEBUG)
# pragma comment(lib, "sxcore_d.lib")
# pragma comment(lib, "BulletDynamics_vs2010_debug.lib")
# pragma comment(lib, "BulletCollision_vs2010_debug.lib")
# pragma comment(lib, "LinearMath_vs2010_debug.lib")
#else
# pragma comment(lib, "sxcore.lib")
# pragma comment(lib, "BulletDynamics_vs2010.lib")
# pragma comment(lib, "BulletCollision_vs2010.lib")
# pragma comment(lib, "LinearMath_vs2010.lib")
#endif
#if !defined(DEF_STD_REPORT)
#define DEF_STD_REPORT
report_func reportf = def_report;
#endif
PhyWorld * g_pWorld = NULL;
#define SP_PRECOND(ret) if(!g_pWorld){reportf(-1, "%s - sxphysics is not init", gen_msg_location);return ret;}
BOOL APIENTRY DllMain(HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
switch (ul_reason_for_call)
{
case DLL_PROCESS_ATTACH:
case DLL_THREAD_ATTACH:
case DLL_THREAD_DETACH:
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}
void Report(int level, const char* format, ...)
{
va_list va;
va_start(va, format);
reportf(level, format, va);
va_end(va);
}
SX_LIB_API void SXPhysics_0Create()
{
if(g_pWorld)
{
reportf(-1, "%s - sxphysics double init", gen_msg_location);
return;
}
Core_SetOutPtr();
g_pWorld = new PhyWorld();
}
SX_LIB_API void SXPhysics_0Kill()
{
SP_PRECOND(_VOID);
mem_delete(g_pWorld);
}
SX_LIB_API void SXPhysics_Update(int thread)
{
SP_PRECOND(_VOID);
g_pWorld->Update(thread);
}
SX_LIB_API void SXPhysics_UpdateSetThreadNum(int num)
{
SP_PRECOND(_VOID);
g_pWorld->SetThreadNum(num);
}
SX_LIB_API void SXPhysics_Sync()
{
SP_PRECOND(_VOID);
g_pWorld->Sync();
}
SX_LIB_API void SXPhysics_Dbg_Set(report_func rf)
{
reportf = rf;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment