Change to latest main. Prepare to 2.2.1 release.

liuliu · Jul 20, 2022 · 2cebccb · 2cebccb
1 parent 268f122
commit 2cebccb
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,7 +6,7 @@
         "repositoryURL": "https://github.com/liuliu/mujoco.git",
         "state": {
           "branch": null,
-          "revision": "00b459c00453de1494552e687d1fb4adc3de1b56",
+          "revision": "04fdacb29a04f96c826d5d289ca61d035a3a7f8b",
           "version": null
         }
       },

diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 var dependencies: [Package.Dependency] = [
   .package(
     name: "C_mujoco", url: "https://github.com/liuliu/mujoco.git",
-    .revision("00b459c00453de1494552e687d1fb4adc3de1b56")),
+    .revision("04fdacb29a04f96c826d5d289ca61d035a3a7f8b")),
   .package(url: "https://github.com/apple/swift-numerics", from: "1.0.0"),
 ]
 

diff --git a/Sources/MjModel+Extensions.swift b/Sources/MjModel+Extensions.swift
@@ -1579,7 +1579,7 @@ extension MjModel {
       unsafeMutablePointer.assign(from: newValue._array, count: Int(nmesh * 1))
     }
   }
-  /// vertex positions for all meshe           (nmeshvert x 3)
+  /// vertex positions for all meshes          (nmeshvert x 3)
   @inlinable
   public var meshVert: MjArray<Float> {
     get { MjArray<Float>(array: _model.pointee.mesh_vert, object: _storage, len: nmeshvert * 3) }

diff --git a/Sources/Mjt.swift b/Sources/Mjt.swift
@@ -666,6 +666,7 @@ public enum MjtSensor: Int32, CustomStringConvertible {
   case subtreecom
   case subtreelinvel
   case subtreeangmom
+  case clock
   case user
   public var description: String {
     switch self {
@@ -739,6 +740,8 @@ public enum MjtSensor: Int32, CustomStringConvertible {
       return "subtreelinvel"
     case .subtreeangmom:
       return "subtreeangmom"
+    case .clock:
+      return "clock"
     case .user:
       return "user"
     }

diff --git a/WORKSPACE b/WORKSPACE
@@ -74,9 +74,9 @@ new_git_repository(
 new_git_repository(
     name = "mujoco",
     build_file = "mujoco.BUILD",
-    commit = "d3a86bb748b272951185a24570f49ceccf07f4e7",
+    commit = "fa1536c2de47ede4dfa184a9139ed7217424ad99",
     remote = "https://github.com/deepmind/mujoco.git",
-    shallow_since = "1657012681 -0700",
+    shallow_since = "1658255253 -0700",
 )
 
 # Other helper functions

diff --git a/deps.bzl b/deps.bzl
@@ -62,7 +62,7 @@ def swift_mujoco_deps():
         new_git_repository,
         name = "mujoco",
         build_file = "@swift-mujoco//:external/mujoco.BUILD",
-        commit = "d3a86bb748b272951185a24570f49ceccf07f4e7",
+        commit = "fa1536c2de47ede4dfa184a9139ed7217424ad99",
         remote = "https://github.com/deepmind/mujoco.git",
-        shallow_since = "1657012681 -0700",
+        shallow_since = "1658255253 -0700",
     )