Преглед на файлове

Turn off determinism check for character test

Jorrit Rouwe преди 3 години
родител
ревизия
54baa54107
променени са 3 файла, в които са добавени 5 реда и са изтрити 6 реда
  1. 0 2
      Samples/Tests/Character/CharacterBaseTest.cpp
  2. 4 0
      Samples/Tests/Character/CharacterBaseTest.h
  3. 1 4
      Samples/Tests/General/MultithreadedTest.h

+ 0 - 2
Samples/Tests/Character/CharacterBaseTest.cpp

@@ -232,13 +232,11 @@ Mat44 CharacterBaseTest::GetCameraPivot(float inCameraHeading, float inCameraPit
 void CharacterBaseTest::SaveState(StateRecorder &inStream) const
 {
 	inStream.Write(mTime);
-	inStream.Write(mRampBlocksTimeLeft);
 }
 
 void CharacterBaseTest::RestoreState(StateRecorder &inStream)
 {
 	inStream.Read(mTime);
-	inStream.Read(mRampBlocksTimeLeft);
 }
 
 void CharacterBaseTest::DrawCharacterState(const CharacterBase *inCharacter, Mat44Arg inCharacterTransform, Vec3Arg inCharacterVelocity)

+ 4 - 0
Samples/Tests/Character/CharacterBaseTest.h

@@ -31,6 +31,10 @@ public:
 	virtual bool			HasSettingsMenu() const override							{ return true; }
 	virtual void			CreateSettingsMenu(DebugUI *inUI, UIElement *inSubMenu) override;
 
+	// Test will never be deterministic since various threads are trying to concurrently add / remove bodies
+	// Ramp blocks are not deterministic (they're teleported, we can't step back)
+	virtual bool			IsDeterministic() const override							{ return mRampBlocks.empty(); }
+
 	// Saving / restoring state for replay
 	virtual void			SaveState(StateRecorder &inStream) const override;
 	virtual void			RestoreState(StateRecorder &inStream) override;

+ 1 - 4
Samples/Tests/General/MultithreadedTest.h

@@ -21,10 +21,7 @@ public:
 	virtual void			Initialize() override;
 
 	// Test will never be deterministic since various threads are trying to concurrently add / remove bodies
-	virtual bool			IsDeterministic() const override
-	{ 
-		return false; 
-	}
+	virtual bool			IsDeterministic() const override							{ return false; }
 
 private:
 	// Execute a lambda either on this thread or in a separate job