-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix crash when using muscles and animatedGeometry in sequential world…
…s. (#6661) * Fix crash when using muscles and animatedGeometry in sequential worlds. The issue was that WbWrenVertexArrayFrameListener thought that the frame had already been handled because it had been handled in the previous world. * Add test case.
- Loading branch information
Showing
7 changed files
with
82 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
tests/api/controllers/track_animated_geometry_muscles/.gitignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/track_animated_geometry_muscles |
25 changes: 25 additions & 0 deletions
25
tests/api/controllers/track_animated_geometry_muscles/Makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Copyright 1996-2023 Cyberbotics Ltd. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# Webots Makefile system | ||
# | ||
# You may add some variable definitions hereafter to customize the build process | ||
# See documentation in $(WEBOTS_HOME_PATH)/resources/Makefile.include | ||
|
||
|
||
# Do not modify the following: this includes Webots global Makefile.include | ||
null := | ||
space := $(null) $(null) | ||
WEBOTS_HOME_PATH?=$(subst $(space),\ ,$(strip $(subst \,/,$(WEBOTS_HOME)))) | ||
include $(WEBOTS_HOME_PATH)/resources/Makefile.include |
21 changes: 21 additions & 0 deletions
21
tests/api/controllers/track_animated_geometry_muscles/track_animated_geometry_muscles.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#include <stdio.h> | ||
#include <webots/brake.h> | ||
#include <webots/motor.h> | ||
#include <webots/position_sensor.h> | ||
#include <webots/robot.h> | ||
#include <webots/supervisor.h> | ||
|
||
#include "../../../lib/ts_assertion.h" | ||
#include "../../../lib/ts_utils.h" | ||
|
||
#define TIME_STEP 32 | ||
|
||
int main(int argc, char **argv) { | ||
ts_setup(argv[0]); | ||
wb_robot_step(TIME_STEP); | ||
// Test that a world with a Muscle node will load. See issue #6659. | ||
wb_supervisor_world_load("../../worlds/supervisor_set_hinge_position_dynamic.wbt"); | ||
|
||
ts_send_success(); | ||
return EXIT_SUCCESS; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
#VRML_SIM R2024a utf8 | ||
|
||
EXTERNPROTO "webots://tests/default/protos/TestSuiteEmitter.proto" | ||
EXTERNPROTO "webots://tests/default/protos/TestSuiteSupervisor.proto" | ||
|
||
WorldInfo { | ||
} | ||
Viewpoint { | ||
} | ||
Background { | ||
} | ||
Robot { | ||
children [ | ||
Track { | ||
children [ | ||
TrackWheel { | ||
} | ||
] | ||
animatedGeometry Shape { | ||
} | ||
} | ||
] | ||
controller "track_animated_geometry_muscles" | ||
supervisor TRUE | ||
} | ||
TestSuiteSupervisor { | ||
} |