diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-12-18 13:31:06 +0100 | 
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-12-18 13:31:06 +0100 | 
| commit | 1d182abe4278b6bf4410cb25a9ae41f501833990 (patch) | |
| tree | 931fb2f3ea876d25abbfcd89ce3a9fb7b962c23c /src | |
| parent | bec22107c6754f5f3440d79503ddbc828d7e0cba (diff) | |
process feedback
Diffstat (limited to 'src')
| -rw-r--r-- | src/crepe/api/Script.h | 8 | ||||
| -rw-r--r-- | src/example/game.cpp | 2 | ||||
| -rw-r--r-- | src/test/ScriptTest.cpp | 10 | ||||
| -rw-r--r-- | src/test/ScriptTest.h | 2 | 
4 files changed, 8 insertions, 14 deletions
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h index 0ec3476..a87af4e 100644 --- a/src/crepe/api/Script.h +++ b/src/crepe/api/Script.h @@ -53,13 +53,7 @@ protected:  	 * This function is called during the ScriptSystem::update() routine if the \c BehaviorScript  	 * component holding this script instance is active.  	 */ -	virtual void update(duration_t delta_time) { return this->update(); } -	/** -	 * \brief Fallback script update function (empty by default) -	 * -	 * Allows the game programmer to ignore parameters passed to \c update() -	 */ -	virtual void update() {} +	virtual void update(duration_t delta_time) {}  	//! \}  	//! ScriptSystem calls \c init() and \c update() diff --git a/src/example/game.cpp b/src/example/game.cpp index 22effd2..3975650 100644 --- a/src/example/game.cpp +++ b/src/example/game.cpp @@ -86,7 +86,7 @@ class MyScript1 : public Script {  		subscribe<KeyPressEvent>(  			[this](const KeyPressEvent & ev) -> bool { return this->keypressed(ev); });  	} -	void update() { +	void update(duration_t) {  		Rigidbody & tf = this->get_component<Rigidbody>();  		Log::logf("linear_velocity.x {}", tf.data.linear_velocity.x);  		Log::logf("linear_velocity.y {}", tf.data.linear_velocity.y); diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp index 499be5a..846e398 100644 --- a/src/test/ScriptTest.cpp +++ b/src/test/ScriptTest.cpp @@ -28,7 +28,7 @@ void ScriptTest::SetUp() {  TEST_F(ScriptTest, Default) {  	MyScript & script = this->script;  	EXPECT_CALL(script, init()).Times(0); -	EXPECT_CALL(script, update()).Times(0); +	EXPECT_CALL(script, update(_)).Times(0);  }  TEST_F(ScriptTest, UpdateOnce) { @@ -38,7 +38,7 @@ TEST_F(ScriptTest, UpdateOnce) {  		InSequence seq;  		EXPECT_CALL(script, init()).Times(1); -		EXPECT_CALL(script, update()).Times(1); +		EXPECT_CALL(script, update(_)).Times(1);  		system.update();  	} @@ -46,7 +46,7 @@ TEST_F(ScriptTest, UpdateOnce) {  		InSequence seq;  		EXPECT_CALL(script, init()).Times(0); -		EXPECT_CALL(script, update()).Times(1); +		EXPECT_CALL(script, update(_)).Times(1);  		system.update();  	}  } @@ -59,7 +59,7 @@ TEST_F(ScriptTest, UpdateInactive) {  		InSequence seq;  		EXPECT_CALL(script, init()).Times(0); -		EXPECT_CALL(script, update()).Times(0); +		EXPECT_CALL(script, update(_)).Times(0);  		behaviorscript.active = false;  		system.update();  	} @@ -68,7 +68,7 @@ TEST_F(ScriptTest, UpdateInactive) {  		InSequence seq;  		EXPECT_CALL(script, init()).Times(1); -		EXPECT_CALL(script, update()).Times(1); +		EXPECT_CALL(script, update(_)).Times(1);  		behaviorscript.active = true;  		system.update();  	} diff --git a/src/test/ScriptTest.h b/src/test/ScriptTest.h index 537169d..f3dbda4 100644 --- a/src/test/ScriptTest.h +++ b/src/test/ScriptTest.h @@ -29,7 +29,7 @@ public:  	public:  		MOCK_METHOD(void, init, (), (override)); -		MOCK_METHOD(void, update, (), (override)); +		MOCK_METHOD(void, update, (crepe::duration_t), (override));  	};  	crepe::OptionalRef<crepe::BehaviorScript> behaviorscript;  |