Skip to content

Commit 5cf5733

Browse files
kostrykinkostrykin
committed
Migrate code from Carna to CarnaLib
1 parent 320095e commit 5cf5733

47 files changed

Lines changed: 678 additions & 785 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/Dockerfile‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build CarnaPy and Docker image
1+
name: Build LibCarnaPy and Docker image
22

33
on:
44
push:
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build_carnapy:
13-
name: Build CarnaPy
13+
name: Build LibCarnaPy
1414
runs-on: ubuntu-latest
1515
steps:
1616
-

‎CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/misc/__init__.py.in
8585
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/misc/py.py
8686
${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_MODULE_NAME}/py.py COPYONLY )
8787

88+
file( GLOB LICENSES "${LibCarna_LICENSE_DIR}/LICENSE*" )
89+
file( COPY ${LICENSES} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/licenses/" )
90+
8891
############################################
8992
# Project
9093
############################################
@@ -98,7 +101,7 @@ set( MODULES
98101
)
99102
set( SRC
100103
src/egl/EGLContext.cpp
101-
src/py/Log.cpp
104+
src/py/log.cpp
102105
src/py/Surface.cpp
103106
src/py/base.cpp
104107
src/py/egl.cpp

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The aim of this package is to provide real-time 3D visualization in Python for s
55

66
See [examples/kalinin2018.ipynb](examples/kalinin2018.ipynb) for an example.
77

8-
[![Build CarnaPy and Docker image](https://github.com/kostrykin/CarnaPy/actions/workflows/build.yml/badge.svg)](https://github.com/kostrykin/CarnaPy/actions/workflows/build.yml)
8+
[![Build LibCarnaPy and Docker image](https://github.com/kostrykin/LibCarnaPy/actions/workflows/build.yml/badge.svg)](https://github.com/kostrykin/LibCarnaPy/actions/workflows/build.yml)
99
![Docker Image Version (latest semver)](https://img.shields.io/docker/v/kostrykin/carnapy?label=DockerHub%3A)
1010
[![Anaconda-Server Badge](https://img.shields.io/badge/Install%20with-conda-%2387c305)](https://anaconda.org/kostrykin/carnapy)
1111
[![Anaconda-Server Badge](https://img.shields.io/conda/v/kostrykin/carnapy.svg?label=Version)](https://anaconda.org/kostrykin/carnapy)
@@ -71,10 +71,10 @@ After building the wheel file, it can be installed using:
7171
python -m pip install --force-reinstall $(find . -name 'LibCarna_Python*.whl')
7272
```
7373

74-
To build against a development version of Carna, install it locally,
74+
To build against a development version of LibCarna, install it locally,
7575
```bash
7676
LIBCARNA_SRC_PREFIX="../LibCarna" ./install_carna_dev.bash
7777
```
7878
where you make `LIBCARNA_SRC_PREFIX` point to the source directory.
7979

80-
This will create a local directory `.libcarna-dev`. The build process will give precedence to Carna from this directory over other versions. Simply remove `.libcarna-dev` to stop building agaisnt the development version of Carna.
80+
This will create a local directory `.libcarna-dev`. The build process will give precedence to LibCarna from this directory over other versions. Simply remove `.libcarna-dev` to stop building agaisnt the development version of LibCarna.

‎docs/carna.presets.rst‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
'sphinx.ext.napoleon',
99
]
1010

11-
html_logo = 'https://kostrykin.github.io/Carna/html/logo.png'
11+
html_logo = 'https://kostrykin.github.io/LibCarna/html/logo.png'
1212
html_static_path = ['_static']
1313
html_css_files = ['custom.css']
1414

1515
import os
1616
import sys
1717

18-
sys.path.append(os.environ['CARNA_PYTHON_PATH'])
18+
sys.path.append(os.environ['LIBCARNA_PYTHON_PATH'])

‎docs/index.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
libcarna-python
22
===============
33

4-
These are the Python bindings for the Carna library. The documentation of the original Carna library can be found at:
5-
https://kostrykin.github.io/Carna/html.
4+
These are the Python bindings for the LibCarna library. The documentation of the original LibCarna library can be found at:
5+
https://kostrykin.github.io/LibCarna/html.
66

77
API
88
---
99

1010
.. toctree::
1111
:maxdepth: 1
1212

13-
carna
14-
carna.base
15-
carna.base.math
16-
carna.egl
17-
carna.helpers
18-
carna.presets
13+
libcarna
14+
libcarna.base
15+
libcarna.base.math
16+
libcarna.egl
17+
libcarna.helpers
18+
libcarna.presets

‎docs/libcarna.base.math.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
libcarna.base.math
2+
==================
3+
4+
.. automodule:: libcarna.base.math
5+
:imported-members:
6+
:members:
7+
:undoc-members:
8+
:show-inheritance:

docs/carna.helpers.rst renamed to docs/libcarna.base.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
carna.helpers
1+
libcarna.base
22
=============
33

4-
.. automodule:: carna.helpers
4+
.. automodule:: libcarna.base
55
:imported-members:
66
:members:
77
:undoc-members:

docs/carna.base.rst renamed to docs/libcarna.egl.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
carna.base
2-
==========
1+
libcarna.egl
2+
============
33

4-
.. automodule:: carna.base
4+
.. automodule:: libcarna.egl
55
:imported-members:
66
:members:
77
:undoc-members:

0 commit comments

Comments
 (0)