Changeset 1554


Ignore:
Timestamp:
Jul 1, 2012, 10:42:08 PM (8 years ago)
Author:
touky
Message:

Added Location modifier in URO.
Added BtPhystest for Bullet Physics test project.

Location:
trunk
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/vs2010/Lol.Core.Rules.props

    r1549 r1554  
    1111      <FloatingPointModel>Fast</FloatingPointModel>
    1212      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    13       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    14       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     13      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(BtPhysIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     14      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(BtPhysIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1515      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1616      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     
    3737      <GenerateDebugInformation>true</GenerateDebugInformation>
    3838      <!-- FIXME: not for the static library! -->
    39       <AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);%(AdditionalDependencies)</AdditionalDependencies>
     39      <AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(BtPhysDeps);$(GdiDeps);%(AdditionalDependencies)</AdditionalDependencies>
    4040      <AdditionalDependencies Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
    4141      <AdditionalDependencies Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies>
    42       <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     42      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(SdlLibs);$(BtPhysLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    4343      <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    4444      <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1535 r1554  
    1919    <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a</SdlDeps>
    2020    <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>
     21
     22    <!-- BulletPhysics -->
     23    <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
     24    <BtPhysIncludes>$(BtPhysDir)\src</BtPhysIncludes>
     25    <BtPhysLibs Condition="'$(Platform)'=='Win32'">$(BtPhysDir)\lib</BtPhysLibs>
     26    <BtPhysDeps Condition="'$(Platform)'=='Win32'">BulletCollision.lib;BulletDynamics.lib;BulletSoftBody.lib;ConvexDecomposition.lib;HACD.lib;LinearMath.lib;OpenGLSupport.lib</BtPhysDeps>
     27    <Win32Defines>$(Win32Defines)</Win32Defines>
    2128
    2229    <!-- GTK+ & GtkGl -->
     
    7986    <BuildMacro Include="SdlLibs"><Value>$(SdlLibs)</Value></BuildMacro>
    8087    <BuildMacro Include="SdlDeps"><Value>$(SdlDeps)</Value></BuildMacro>
     88    <BuildMacro Include="BtPhysDir"><Value>$(BtPhysDir)</Value></BuildMacro>
     89    <BuildMacro Include="BtPhysIncludes"><Value>$(BtPhysIncludes)</Value></BuildMacro>
     90    <BuildMacro Include="BtPhysLibs"><Value>$(BtPhysLibs)</Value></BuildMacro>
     91    <BuildMacro Include="BtPhysDeps"><Value>$(BtPhysDeps)</Value></BuildMacro>
    8192    <BuildMacro Include="GtkDir"><Value>$(GtkDir)</Value></BuildMacro>
    8293    <BuildMacro Include="GtkGlDir"><Value>$(GtkGlDir)</Value></BuildMacro>
  • trunk/build/vs2010/Lol.sln

    r1539 r1554  
    8484EndProject
    8585Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\games\ToukyDemo\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}"
     86EndProject
     87Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BtPhysTest", "..\..\test\BtPhysTest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}"
    8688EndProject
    8789Global
     
    9092                Debug|Windows (32-bit) = Debug|Windows (32-bit)
    9193                Debug|Windows (64-bit) = Debug|Windows (64-bit)
     94                Debug|x64 = Debug|x64
    9295                Debug|Xbox 360 = Debug|Xbox 360
    9396                Release|PlayStation 3 = Release|PlayStation 3
    9497                Release|Windows (32-bit) = Release|Windows (32-bit)
    9598                Release|Windows (64-bit) = Release|Windows (64-bit)
     99                Release|x64 = Release|x64
    96100                Release|Xbox 360 = Release|Xbox 360
    97101        EndGlobalSection
     
    103107                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    104108                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Windows (64-bit).Build.0 = Debug|x64
     109                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|x64.ActiveCfg = Debug|x64
    105110                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    106111                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    112117                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Windows (64-bit).ActiveCfg = Release|x64
    113118                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Windows (64-bit).Build.0 = Release|x64
     119                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|x64.ActiveCfg = Release|x64
    114120                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    115121                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    121127                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    122128                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Windows (64-bit).Build.0 = Debug|x64
     129                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|x64.ActiveCfg = Debug|x64
     130                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|x64.Build.0 = Debug|x64
    123131                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    124132                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    129137                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Windows (32-bit).Build.0 = Release|Win32
    130138                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Windows (64-bit).ActiveCfg = Release|x64
    131                 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Windows (64-bit).Build.0 = Release|x64
     139                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|x64.ActiveCfg = Release|x64
     140                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|x64.Build.0 = Release|x64
    132141                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    133142                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    136145                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Windows (32-bit).ActiveCfg = Debug|Win32
    137146                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
     147                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|x64.ActiveCfg = Debug|x64
    138148                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    139149                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|PlayStation 3.ActiveCfg = Release|PS3
    140150                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Windows (32-bit).ActiveCfg = Release|Win32
    141151                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Windows (64-bit).ActiveCfg = Release|x64
     152                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|x64.ActiveCfg = Release|x64
    142153                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    143154                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|PlayStation 3.ActiveCfg = Debug|PS3
     
    147158                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    148159                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Windows (64-bit).Build.0 = Debug|x64
     160                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.ActiveCfg = Debug|x64
     161                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.Build.0 = Debug|x64
    149162                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    150163                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    156169                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Windows (64-bit).ActiveCfg = Release|x64
    157170                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Windows (64-bit).Build.0 = Release|x64
     171                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.ActiveCfg = Release|x64
     172                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.Build.0 = Release|x64
    158173                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    159174                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    165180                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    166181                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Windows (64-bit).Build.0 = Debug|x64
     182                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|x64.ActiveCfg = Debug|x64
     183                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|x64.Build.0 = Debug|x64
    167184                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    168185                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    173190                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Windows (32-bit).Build.0 = Release|Win32
    174191                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Windows (64-bit).ActiveCfg = Release|x64
    175                 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Windows (64-bit).Build.0 = Release|x64
     192                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|x64.ActiveCfg = Release|x64
     193                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|x64.Build.0 = Release|x64
    176194                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    177195                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    183201                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    184202                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Windows (64-bit).Build.0 = Debug|x64
     203                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.ActiveCfg = Debug|x64
     204                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.Build.0 = Debug|x64
    185205                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    186206                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    191211                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Windows (32-bit).Build.0 = Release|Win32
    192212                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Windows (64-bit).ActiveCfg = Release|x64
    193                 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Windows (64-bit).Build.0 = Release|x64
     213                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64
     214                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64
    194215                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    195216                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    201222                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    202223                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Windows (64-bit).Build.0 = Debug|x64
     224                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|x64.ActiveCfg = Debug|x64
     225                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|x64.Build.0 = Debug|x64
    203226                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    204227                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    209232                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Windows (32-bit).Build.0 = Release|Win32
    210233                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Windows (64-bit).ActiveCfg = Release|x64
    211                 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Windows (64-bit).Build.0 = Release|x64
     234                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|x64.ActiveCfg = Release|x64
     235                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|x64.Build.0 = Release|x64
    212236                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    213237                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    219243                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    220244                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Windows (64-bit).Build.0 = Debug|x64
     245                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.ActiveCfg = Debug|x64
     246                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.Build.0 = Debug|x64
    221247                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    222248                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    227253                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Windows (32-bit).Build.0 = Release|Win32
    228254                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Windows (64-bit).ActiveCfg = Release|x64
    229                 {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Windows (64-bit).Build.0 = Release|x64
     255                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.ActiveCfg = Release|x64
     256                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.Build.0 = Release|x64
    230257                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    231258                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    237264                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    238265                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Windows (64-bit).Build.0 = Debug|x64
     266                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.ActiveCfg = Debug|x64
     267                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.Build.0 = Debug|x64
    239268                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    240269                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    245274                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Windows (32-bit).Build.0 = Release|Win32
    246275                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Windows (64-bit).ActiveCfg = Release|x64
    247                 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Windows (64-bit).Build.0 = Release|x64
     276                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.ActiveCfg = Release|x64
     277                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.Build.0 = Release|x64
    248278                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    249279                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    255285                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    256286                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Windows (64-bit).Build.0 = Debug|x64
     287                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
     288                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
    257289                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    258290                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    263295                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Windows (32-bit).Build.0 = Release|Win32
    264296                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Windows (64-bit).ActiveCfg = Release|x64
    265                 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Windows (64-bit).Build.0 = Release|x64
     297                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
     298                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
    266299                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    267300                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    273306                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    274307                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Windows (64-bit).Build.0 = Debug|x64
     308                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|x64.ActiveCfg = Debug|x64
     309                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|x64.Build.0 = Debug|x64
    275310                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    276311                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    281316                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Windows (32-bit).Build.0 = Release|Win32
    282317                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Windows (64-bit).ActiveCfg = Release|x64
    283                 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Windows (64-bit).Build.0 = Release|x64
     318                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|x64.ActiveCfg = Release|x64
     319                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|x64.Build.0 = Release|x64
    284320                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    285321                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    291327                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    292328                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Windows (64-bit).Build.0 = Debug|x64
     329                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.ActiveCfg = Debug|x64
     330                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.Build.0 = Debug|x64
    293331                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    294332                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    299337                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Windows (32-bit).Build.0 = Release|Win32
    300338                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Windows (64-bit).ActiveCfg = Release|x64
    301                 {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Windows (64-bit).Build.0 = Release|x64
     339                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.ActiveCfg = Release|x64
     340                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.Build.0 = Release|x64
    302341                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    303342                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.Build.0 = Release|Xbox 360
     
    308347                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    309348                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Windows (64-bit).Build.0 = Debug|x64
     349                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.ActiveCfg = Debug|x64
     350                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.Build.0 = Debug|x64
    310351                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    311352                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|PlayStation 3.ActiveCfg = Release|PS3
     
    313354                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Windows (32-bit).Build.0 = Release|Win32
    314355                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Windows (64-bit).ActiveCfg = Release|x64
    315                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Windows (64-bit).Build.0 = Release|x64
     356                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.ActiveCfg = Release|x64
     357                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.Build.0 = Release|x64
    316358                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    317359                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|PlayStation 3.ActiveCfg = Debug|PS3
     
    321363                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Windows (64-bit).ActiveCfg = Debug|x64
    322364                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Windows (64-bit).Build.0 = Debug|x64
     365                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
     366                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.Build.0 = Debug|x64
    323367                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
    324368                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     
    330374                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Windows (64-bit).ActiveCfg = Release|x64
    331375                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Windows (64-bit).Build.0 = Release|x64
     376                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.ActiveCfg = Release|x64
     377                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.Build.0 = Release|x64
    332378                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    333379                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Xbox 360.Build.0 = Release|Xbox 360
    334380                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     381                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|PlayStation 3.ActiveCfg = Debug|x64
     382                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Windows (32-bit).ActiveCfg = Debug|Win32
     383                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Windows (32-bit).Build.0 = Debug|Win32
     384                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Windows (64-bit).ActiveCfg = Debug|Win32
     385                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
     386                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.Build.0 = Debug|x64
     387                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Xbox 360.ActiveCfg = Debug|x64
     388                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|PlayStation 3.ActiveCfg = Release|x64
     389                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Windows (32-bit).ActiveCfg = Release|Win32
     390                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Windows (32-bit).Build.0 = Release|Win32
     391                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Windows (64-bit).ActiveCfg = Release|Win32
     392                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.ActiveCfg = Release|x64
     393                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.Build.0 = Release|x64
     394                {EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Xbox 360.ActiveCfg = Release|x64
    335395        EndGlobalSection
    336396        GlobalSection(SolutionProperties) = preSolution
     
    350410                {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF}
    351411                {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
     412                {EE203B88-44CF-4859-9D42-7A1F43FECB52} = {E0491194-35E3-4513-9D31-608EA3165ECF}
    352413                {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
    353414                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
  • trunk/games/ToukyDemo/Character.h

    r1551 r1554  
    217217                                {
    218218                                        m_body_cos[i].z += 2.0f * seconds;
    219                                         /*
    220                                         float fPI = M_PI;
    221                                         float Tmp = (std::abs(std::fmod(m_body_cos[i].z, fPI * 2.0f) - fPI) / fPI);
    222                                         Tmp = Tmp * Tmp * (3 - 2 * Tmp);
    223                                         Tmp = Tmp * 2.0f - 1.f;
    224                                         m_body_rotation[i].z = Tmp * 30.0f;
    225                                         */
    226219                                        m_body_rotation[i].z = lol::cos(m_body_cos[i].z) * 30.0f;
    227220                                        break;
  • trunk/games/ToukyDemo/UserReactiveObject.h

    r1548 r1554  
    99#define __USERREACTIVEOBJECT_H__
    1010
    11 #define DEF_X 12
     11#define DEF_X 15
    1212#define DEF_Y 1
    13 #define DEF_Z 12
     13#define DEF_Z 15
    1414#define DEF_SIZE 10
    1515#define DEF_INF_BLEND 50
     
    168168public:
    169169    UserReactiveObject()
    170       : m_ready(false)
     170      : m_ready(false),
     171                m_dist_modifier_influence_point(vec3(1.0f)),
     172                m_dist_modifier_grid_point(vec3(1.0f)),
     173                m_wave_angle(0.0f),
     174                m_debug_point_angle(0.0f)
    171175    {
     176
     177                m_dist_modifier_influence_point.y = .0f;
     178
    172179                m_ref_mesh.Compile( "[sc#f80 afcb10 8 8 -1]"
    173180                                                        "[sc#bbd afcb8 10 8 -1]"
    174181                                                        "[sc#44d afcb8 8 10 -1]");
    175 
    176                 wave_angle = 0.0f;
    177                 debug_point_angle = 0.0f;
    178182
    179183                m_influence_list << (influence_infos(0.0f, false, false, INF_WAVE)
     
    234238
    235239                m_rotation *= quat::rotate(seconds * 10.0f, vec3(0, 1, 0));
    236                 LocalToWorld = mat4::translate(m_position) * mat4(m_rotation);
     240                m_local_to_world = mat4::translate(m_position) * mat4(m_rotation);
    237241
    238242                m_influence_point_list.Empty();
    239243
    240                 wave_angle += 3.0f * seconds;
    241                 debug_point_angle += 1.0f * seconds;
    242 
    243                 if (wave_angle > M_PI * 2.0f)
    244                         wave_angle -= M_PI * 2.0f;
    245                 if (debug_point_angle > M_PI * 2.0f)
    246                         debug_point_angle -= M_PI * 2.0f;
     244                m_wave_angle += 3.0f * seconds;
     245                m_debug_point_angle += 1.0f * seconds;
     246
     247                if (m_wave_angle > M_PI * 2.0f)
     248                        m_wave_angle -= M_PI * 2.0f;
     249                if (m_debug_point_angle > M_PI * 2.0f)
     250                        m_debug_point_angle -= M_PI * 2.0f;
    247251
    248252                for (int i = 0; i < m_influencing_entities.Count(); ++i)
     
    250254                        if (m_influencing_entities[i])
    251255                        {
    252                                 mat4 LocalPos = inverse(LocalToWorld) * mat4::translate(m_influencing_entities[i]->m_position);
     256                                mat4 LocalPos = inverse(m_local_to_world) * mat4::translate(m_influencing_entities[i]->m_position);
    253257                                m_influence_point_list << influencing_point_infos(BLD_SPHERE, LocalPos.v3.xyz, 1.0f);
    254258                        }
    255259                }
    256260
    257                 //m_influence_point_list << influencing_point_infos(BLD_SPHERE, vec3(lol::cos(debug_point_angle) * DEF_X, 0, lol::sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
    258                 //m_influence_point_list << influencing_point_infos(BLD_SQUARE, vec3(-lol::cos(debug_point_angle) * DEF_X, 0, -lol::sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
     261                //m_influence_point_list << influencing_point_infos(BLD_SPHERE, vec3(lol::cos(m_debug_point_angle) * DEF_X, 0, lol::sin(m_debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
     262                //m_influence_point_list << influencing_point_infos(BLD_SQUARE, vec3(-lol::cos(m_debug_point_angle) * DEF_X, 0, -lol::sin(m_debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
    259263
    260264                ComputeInfluenceValues();
     
    268272                for (int i=0; i < m_point_list.Count(); i++)
    269273                {
    270                         m_point_list[i].m_influence_previous = m_point_list[i].m_influence;
    271 
    272274                        float cur_blend = 0.0f;
    273                         for (int j=0; j < m_influence_point_list.Count(); j++)
     275                        transient_infos &CurTI = m_point_list[i];
     276
     277                        CurTI.m_influence_previous = CurTI.m_influence;
     278
     279                        for (int j = 0; j < m_influence_point_list.Count(); j++)
    274280                        {
    275281                                float new_blend = 0.0f;
    276                                 switch (m_influence_point_list[j].m_useage)
     282                                influencing_point_infos &CurIPI = m_influence_point_list[j];
     283                                vec3 ModBasePos = CurTI.m_base_pos * m_dist_modifier_grid_point;
     284                                vec3 ModInfPos = CurIPI.m_position * m_dist_modifier_influence_point;
     285
     286                                switch (CurIPI.m_useage)
    277287                                {
    278                                 case BLD_SPHERE:
     288                                        case BLD_SPHERE:
    279289                                        {
    280                                                 new_blend = 1.0f - min(1.0f, max(0.0f, length(m_point_list[i].m_base_pos - m_influence_point_list[j].m_position) - DEF_INF_MAX) / DEF_INF_BLEND);
     290                                                new_blend = 1.0f - min(1.0f, max(0.0f, length(ModBasePos - ModInfPos) - DEF_INF_MAX) / DEF_INF_BLEND);
    281291                                                break;
    282292                                        }
    283                                 case BLD_SQUARE:
     293                                        case BLD_SQUARE:
    284294                                        {
    285                                                 vec3 point_diff = m_point_list[i].m_base_pos - m_influence_point_list[j].m_position;
     295                                                vec3 point_diff = ModBasePos - ModInfPos;
    286296                                                point_diff = vec3(std::abs(point_diff.x), std::abs(point_diff.y), std::abs(point_diff.z));
    287297
     
    291301                                                break;
    292302                                        }
    293                                 default:
     303                                        default:
    294304                                        {
    295305                                                break;
     
    297307                                };
    298308
    299                                 //cur_blend = max(cur_blend, 1.0f - min(1.0f, max(0.0f, length(m_point_list[i].m_base_pos - m_influence_point_list[j].m_position) - DEF_INF_MAX) / DEF_INF_BLEND));
     309                                //cur_blend = max(cur_blend, 1.0f - min(1.0f, max(0.0f, length(ModBasePos - ModInfPos) - DEF_INF_MAX) / DEF_INF_BLEND));
    300310                                cur_blend = max(cur_blend, new_blend);
    301311                        }
    302312
    303                         m_point_list[i].m_influence = cur_blend;
     313                        CurTI.m_influence = cur_blend;
    304314                }
    305315        }
     
    374384                        case INF_WAVE:
    375385                        {
    376                                 float point_angle = wave_angle + (float)src_transient.m_point_id * 2.0f * (float)M_PI * 2.0f / ((float)DEF_X * 1.051f);
     386                                float point_angle = m_wave_angle + (float)src_transient.m_point_id * 2.0f * (float)M_PI * 2.0f / ((float)DEF_X * 1.051f);
    377387                                dst_work.m_pos += vec3(0.0f, (-1.0f + lol::cos(point_angle)) * 20.0f, 0.0f);
    378388                                //TODO : dst_work.m_rot += vec3(0,0,0);
     
    410420                for (int i=0; i < m_point_list.Count(); i++)
    411421                {
    412                         mat4 model = LocalToWorld *
     422                        mat4 model = m_local_to_world *
    413423                                mat4::translate(m_point_list[i].m_final_pos) *
    414424                                mat4(quat::fromeuler_yxz(m_point_list[i].m_final_rot)) *
     
    430440        Array<WorldEntity*>                             m_influencing_entities;
    431441
    432         float                                                   wave_angle;
    433         float                                                   debug_point_angle;
    434         mat4                                                    LocalToWorld;
     442        vec3                                                    m_dist_modifier_influence_point;
     443        vec3                                                    m_dist_modifier_grid_point;
     444
     445        float                                                   m_wave_angle;
     446        float                                                   m_debug_point_angle;
     447        mat4                                                    m_local_to_world;
    435448    bool                                                        m_ready;
    436449};
Note: See TracChangeset for help on using the changeset viewer.