Skip to content

Commit

Permalink
Pushing merge, resolved using upstream.\n\n message=Fix actions yaml …
Browse files Browse the repository at this point in the history
…with rive-renderer

Fix actions yaml with rive-renderer instead of cpp

Diffs=
21ecf2775 Fix actions yaml with rive-renderer (#7930)
c33d5d81b Update rive renderer readme (#7929)
b03895fcf Update pls README (#7927)
3316d15ca Refactor pls into runtime (#7914)

Co-authored-by: Chris Dalton <[email protected]>
Co-authored-by: rivessamr <[email protected]> diff=\n\ndiff --cc pls/README.md
index 1f4232bd,272c7360..00000000
--- a/pls/README.md
+++ b/pls/README.md
@@@ -2,21 -2,21 +2,37 @@@

  The Rive Renderer is a vector and raster graphics renderer custom-built for Rive content, for animation, and for runtime.

++<<<<<<< ours
 +This repository contains the renderer code and an example for how to interface with it directly. The code within this repository does not contain a Rive runtime. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.
 +
 +## Clone this repo
 +
 +Make sure to clone this repo with submodules!
 +
 +```
 +git clone --recurse-submodules [email protected]:rive-app/rive-renderer.git
++=======
+ This folder contains the renderer code and an example for how to interface with it directly. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.
+
+ ## Clone the rive-runtime repo
+
+ ```
+ git clone https://github.com/rive-app/rive-runtime.git
+ cd rive-runtime/pls
++>>>>>>> theirs
  ```

  ## Build GLFW

  ```
++<<<<<<< ours
 +cd submodules/rive-cpp/skia/dependencies
 +./make_glfw.sh
++=======
+ pushd ../skia/dependencies
+ ./make_glfw.sh
+ popd
++>>>>>>> theirs
  ```

  ## Install Python PLY
@@@ -28,7 -28,7 +44,11 @@@ python3 -m pip install pl
  ## Add build_rive.sh to $PATH

  ```
++<<<<<<< ours
 +export PATH="$PATH:$(pwd)/submodules/rive-cpp/build"
++=======
+ export PATH="$PATH:$(realpath ../build)"
++>>>>>>> theirs
  ```

  ## Build & run
  • Loading branch information
rivessamr committed Aug 23, 2024
1 parent b2160fb commit 583c105
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5f6ea0da19c6d1b517ba091d84706141c9a6f59f
21ecf27753b8eedd68ec732b2b2a76c4a4cdb1d8
14 changes: 7 additions & 7 deletions pls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

The Rive Renderer is a vector and raster graphics renderer custom-built for Rive content, for animation, and for runtime.

This repository contains the renderer code and an example for how to interface with it directly. The code within this repository does not contain a Rive runtime. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.
This folder contains the renderer code and an example for how to interface with it directly. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.

## Clone this repo

Make sure to clone this repo with submodules!
## Clone the rive-runtime repo

```
git clone --recurse-submodules [email protected]:rive-app/rive-renderer.git
git clone https://github.com/rive-app/rive-runtime.git
cd rive-runtime/pls
```

## Build GLFW

```
cd submodules/rive-cpp/skia/dependencies
pushd ../skia/dependencies
./make_glfw.sh
popd
```

## Install Python PLY
Expand All @@ -28,7 +28,7 @@ python3 -m pip install ply
## Add build_rive.sh to $PATH

```
export PATH="$PATH:$(pwd)/submodules/rive-cpp/build"
export PATH="$PATH:$(realpath ../build)"
```

## Build & run
Expand Down

0 comments on commit 583c105

Please sign in to comment.