Changeset 1795


Ignore:
Timestamp:
Aug 23, 2012, 4:00:43 PM (11 years ago)
Author:
touky
Message:

Fixed Entity::TickGame log flood.
Added BulletCharacterController.cpp & BulletCharacterController.h stubs.

Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/input/input.h

    r1792 r1795  
    381381
    382382protected:
     383        virtual char const *    GetName()
     384        {
     385                return "<InputTracker>";
     386        }
    383387        virtual void                    TickGame(float seconds)
    384388        {
     389                Entity::TickGame(seconds);
     390
    385391                UpdateActionStatus(seconds);
    386392        }

  • trunk/test/BtPhysTest.vcxproj

    r1747 r1795  
    3838    <ClInclude Include="BtPhysTest.h" />
    3939    <ClInclude Include="PhysicObject.h" />
     40    <ClInclude Include="Physics\Include\BulletCharacterController.h" />
    4041    <ClInclude Include="Physics\Include\EasyCharacterController.h" />
    4142    <ClInclude Include="Physics\Include\EasyConstraint.h" />
    … …  
    4647  <ItemGroup>
    4748    <ClCompile Include="BtPhysTest.cpp" />
     49    <ClCompile Include="Physics\Src\BulletCharacterController.cpp" />
    4850    <ClCompile Include="Physics\Src\EasyCharacterController.cpp" />
    4951    <ClCompile Include="Physics\Src\EasyConstraint.cpp" />
    … …  
    5456      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    5557    </ProjectReference>
     58  </ItemGroup>
     59  <ItemGroup>
     60    <None Include="Makefile.am">
     61      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     62    </None>
    5663  </ItemGroup>
    5764  <PropertyGroup Label="Globals">

  • trunk/test/BtPhysTest.vcxproj.filters

    r1747 r1795  
    1919      <Filter>Physics\Include</Filter>
    2020    </ClInclude>
     21    <ClInclude Include="Physics\Include\BulletCharacterController.h">
     22      <Filter>Physics\Include</Filter>
     23    </ClInclude>
    2124  </ItemGroup>
    2225  <ItemGroup>
    … …  
    2932    </ClCompile>
    3033    <ClCompile Include="Physics\Src\EasyPhysics.cpp">
     34      <Filter>Physics\Src</Filter>
     35    </ClCompile>
     36    <ClCompile Include="Physics\Src\BulletCharacterController.cpp">
    3137      <Filter>Physics\Src</Filter>
    3238    </ClCompile>
    … …  
    4652    </Filter>
    4753  </ItemGroup>
     54  <ItemGroup>
     55    <None Include="Makefile.am" />
     56  </ItemGroup>
    4857</Project>

  • trunk/test/Makefile.am

    r1760 r1795  
    5151    Physics/Include/LolBtPhysicsIntegration.h Physics/Include/LolPhysics.h \
    5252    Physics/Src/EasyCharacterController.cpp Physics/Src/EasyConstraint.cpp \
     53        Physics/Src/BulletCharacterController.cpp \
    5354    Physics/Include/EasyCharacterController.h Physics/Include/EasyConstraint.h
     55        Physics/Src/BulletCharacterController.h \
    5456btphystest_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ -I$(top_builddir)/src/bullet \
    5557    -DHAVE_PHYS_USE_BULLET

  • trunk/test/Physics/Include/EasyCharacterController.h

    r1785 r1795  
    7474protected:
    7575        virtual void BaseTransformChanged(const lol::mat4& PreviousMatrix, const lol::mat4& NewMatrix);
     76        virtual char const *GetName();
    7677public:
    7778        virtual void TickGame(float seconds);

  • trunk/test/Physics/Src/EasyCharacterController.cpp

    r1785 r1795  
    126126}
    127127
     128//---
     129char const *EasyCharacterController::GetName()
     130{
     131        return "<EasyCharacterController>";
     132}
     133
    128134//Physic Tick
    129135void EasyCharacterController::TickGame(float seconds)
Note: See TracChangeset for help on using the changeset viewer.