Skip to content

Fixes after eventemitter3 migration #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MatthijsBurgh merged 3 commits into from
Oct 18, 2024
Merged

Fixes after eventemitter3 migration #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b20e4c7
Missed EventEmitter2 in es6 transpiler
MatthijsBurgh Oct 18, 2024
ea10c88
(README) EventEmitter2 -> 3
MatthijsBurgh Oct 18, 2024
447214b
(examples) EventEmitter2 -> 3
MatthijsBurgh Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Alternatively, you can use the current release via the [JsDelivr](https://www.js

ros3djs depends on:

[EventEmitter2](https://github.com/hij1nx/EventEmitter2). The current supported version is 6.4. The current supported version can be found on the JsDeliver CDN: ([full](https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js)) | ([min](https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.min.js))
[EventEmitter3](https://github.com/primus/eventemitter3). The current supported version is 5.0. The current supported version can be found on the JsDeliver CDN: ([full](https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.js)) | ([min](https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.js))

[three.js](https://github.com/mrdoob/three.js/). The current supported version is r89. The current supported version can be found on the Robot Web Tools CDN: ([full](https://cdn.jsdelivr.net/npm/[email protected]/build/three.js)) | ([min](https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js))

Expand Down
2 changes: 1 addition & 1 deletion es6-transpiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ const transpile = {
],
// Track external dependencies for import injection
externalDependencies: (filepath) => [
/(.*)(THREE|EventEmitter2|ROSLIB|ColladaLoader|OBJLoader|MTLLoader|STLLoader).*/g,
/(.*)(THREE|EventEmitter3|ROSLIB|ColladaLoader|OBJLoader|MTLLoader|STLLoader).*/g,
(match, $preStuffs, $dep) => {

if (/^\s*(?:\*|\/\/)/.test($preStuffs)) {
Expand Down
2 changes: 1 addition & 1 deletion examples/continuousmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/depthcloud.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/interactivemarkers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/kitti.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/markers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/navsatfix.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/octree.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/pointcloud2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/urdf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<!-- <script src="https://static.robotwebtools.org/threejs/current/ColladaLoader.js"></script> --><!-- CDN is gone -->
<!-- <script src="https://static.robotwebtools.org/threejs/current/STLLoader.js"></script> --><!-- CDN is gone -->
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/eventemitter2.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/eventemitter3.umd.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/roslib@1/build/roslib.js"></script>
<script src="../build/ros3d.js"></script>
<script src="js/ColladaLoader.js"></script> <!-- override the default ColladaLoader -->
Expand Down