Skip to content

Commit 62dceae

Browse files
kostrykinkostrykin
committed
Adapt to newest upstream changes
1 parent 3584714 commit 62dceae

File tree

4 files changed

+123
-123
lines changed

4 files changed

+123
-123
lines changed

‎examples/cells.ipynb‎

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

‎examples/cthead.ipynb‎

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

‎examples/introduction.ipynb‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"id": "3bf7058d",
1515
"metadata": {
1616
"execution": {
17-
"iopub.execute_input": "2025-05-10T19:52:08.669176Z",
18-
"iopub.status.busy": "2025-05-10T19:52:08.669077Z",
19-
"iopub.status.idle": "2025-05-10T19:52:09.229284Z",
20-
"shell.execute_reply": "2025-05-10T19:52:09.228724Z"
17+
"iopub.execute_input": "2025-05-10T20:19:40.973319Z",
18+
"iopub.status.busy": "2025-05-10T20:19:40.973120Z",
19+
"iopub.status.idle": "2025-05-10T20:19:41.539047Z",
20+
"shell.execute_reply": "2025-05-10T20:19:41.538602Z"
2121
},
2222
"vscode": {
2323
"languageId": "plaintext"
@@ -52,10 +52,10 @@
5252
"id": "cd38b675",
5353
"metadata": {
5454
"execution": {
55-
"iopub.execute_input": "2025-05-10T19:52:09.231323Z",
56-
"iopub.status.busy": "2025-05-10T19:52:09.231056Z",
57-
"iopub.status.idle": "2025-05-10T19:52:09.233482Z",
58-
"shell.execute_reply": "2025-05-10T19:52:09.232972Z"
55+
"iopub.execute_input": "2025-05-10T20:19:41.540455Z",
56+
"iopub.status.busy": "2025-05-10T20:19:41.540197Z",
57+
"iopub.status.idle": "2025-05-10T20:19:41.542208Z",
58+
"shell.execute_reply": "2025-05-10T20:19:41.541863Z"
5959
},
6060
"vscode": {
6161
"languageId": "plaintext"
@@ -84,10 +84,10 @@
8484
"id": "8518d1b2",
8585
"metadata": {
8686
"execution": {
87-
"iopub.execute_input": "2025-05-10T19:52:09.235090Z",
88-
"iopub.status.busy": "2025-05-10T19:52:09.234976Z",
89-
"iopub.status.idle": "2025-05-10T19:52:09.237318Z",
90-
"shell.execute_reply": "2025-05-10T19:52:09.236909Z"
87+
"iopub.execute_input": "2025-05-10T20:19:41.543276Z",
88+
"iopub.status.busy": "2025-05-10T20:19:41.543102Z",
89+
"iopub.status.idle": "2025-05-10T20:19:41.545044Z",
90+
"shell.execute_reply": "2025-05-10T20:19:41.544752Z"
9191
},
9292
"vscode": {
9393
"languageId": "plaintext"
@@ -120,10 +120,10 @@
120120
"id": "df9403bf",
121121
"metadata": {
122122
"execution": {
123-
"iopub.execute_input": "2025-05-10T19:52:09.238944Z",
124-
"iopub.status.busy": "2025-05-10T19:52:09.238843Z",
125-
"iopub.status.idle": "2025-05-10T19:52:09.243616Z",
126-
"shell.execute_reply": "2025-05-10T19:52:09.243217Z"
123+
"iopub.execute_input": "2025-05-10T20:19:41.546244Z",
124+
"iopub.status.busy": "2025-05-10T20:19:41.546005Z",
125+
"iopub.status.idle": "2025-05-10T20:19:41.550293Z",
126+
"shell.execute_reply": "2025-05-10T20:19:41.549955Z"
127127
},
128128
"vscode": {
129129
"languageId": "plaintext"
@@ -133,7 +133,7 @@
133133
{
134134
"data": {
135135
"text/plain": [
136-
"<libcarna._spatial.geometry.<locals>.Geometry at 0x7f59be98dd90>"
136+
"<libcarna._spatial.geometry.<locals>.Geometry at 0x785136d31d90>"
137137
]
138138
},
139139
"execution_count": 4,
@@ -182,10 +182,10 @@
182182
"id": "4a1a1c31",
183183
"metadata": {
184184
"execution": {
185-
"iopub.execute_input": "2025-05-10T19:52:09.245201Z",
186-
"iopub.status.busy": "2025-05-10T19:52:09.245098Z",
187-
"iopub.status.idle": "2025-05-10T19:52:09.247433Z",
188-
"shell.execute_reply": "2025-05-10T19:52:09.247030Z"
185+
"iopub.execute_input": "2025-05-10T20:19:41.551417Z",
186+
"iopub.status.busy": "2025-05-10T20:19:41.551196Z",
187+
"iopub.status.idle": "2025-05-10T20:19:41.553164Z",
188+
"shell.execute_reply": "2025-05-10T20:19:41.552855Z"
189189
},
190190
"vscode": {
191191
"languageId": "plaintext"
@@ -221,10 +221,10 @@
221221
"id": "0ca491a8",
222222
"metadata": {
223223
"execution": {
224-
"iopub.execute_input": "2025-05-10T19:52:09.248860Z",
225-
"iopub.status.busy": "2025-05-10T19:52:09.248758Z",
226-
"iopub.status.idle": "2025-05-10T19:52:09.323939Z",
227-
"shell.execute_reply": "2025-05-10T19:52:09.323457Z"
224+
"iopub.execute_input": "2025-05-10T20:19:41.554332Z",
225+
"iopub.status.busy": "2025-05-10T20:19:41.554108Z",
226+
"iopub.status.idle": "2025-05-10T20:19:41.638526Z",
227+
"shell.execute_reply": "2025-05-10T20:19:41.638149Z"
228228
},
229229
"vscode": {
230230
"languageId": "plaintext"
@@ -253,10 +253,10 @@
253253
"id": "37ff9c22",
254254
"metadata": {
255255
"execution": {
256-
"iopub.execute_input": "2025-05-10T19:52:09.325449Z",
257-
"iopub.status.busy": "2025-05-10T19:52:09.325340Z",
258-
"iopub.status.idle": "2025-05-10T19:52:09.419526Z",
259-
"shell.execute_reply": "2025-05-10T19:52:09.419090Z"
256+
"iopub.execute_input": "2025-05-10T20:19:41.639835Z",
257+
"iopub.status.busy": "2025-05-10T20:19:41.639595Z",
258+
"iopub.status.idle": "2025-05-10T20:19:41.733413Z",
259+
"shell.execute_reply": "2025-05-10T20:19:41.733085Z"
260260
},
261261
"vscode": {
262262
"languageId": "plaintext"
@@ -266,7 +266,7 @@
266266
{
267267
"data": {
268268
"text/plain": [
269-
"<matplotlib.image.AxesImage at 0x7f5bf32763c0>"
269+
"<matplotlib.image.AxesImage at 0x78536b5edf10>"
270270
]
271271
},
272272
"execution_count": 7,
@@ -307,10 +307,10 @@
307307
"id": "10ab7a0a",
308308
"metadata": {
309309
"execution": {
310-
"iopub.execute_input": "2025-05-10T19:52:09.421023Z",
311-
"iopub.status.busy": "2025-05-10T19:52:09.420912Z",
312-
"iopub.status.idle": "2025-05-10T19:52:09.550232Z",
313-
"shell.execute_reply": "2025-05-10T19:52:09.549770Z"
310+
"iopub.execute_input": "2025-05-10T20:19:41.734755Z",
311+
"iopub.status.busy": "2025-05-10T20:19:41.734566Z",
312+
"iopub.status.idle": "2025-05-10T20:19:41.857992Z",
313+
"shell.execute_reply": "2025-05-10T20:19:41.857721Z"
314314
},
315315
"vscode": {
316316
"languageId": "plaintext"

‎src/py/base.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ RenderStageView::~RenderStageView()
206206
// MeshRenderingStageView
207207
// ----------------------------------------------------------------------------------
208208

209-
const unsigned int MeshRenderingStageView::DEFAULT_ROLE_MESH = LibCarna::base::MeshRenderingMixin::ROLE_DEFAULT_MESH;
210-
const unsigned int MeshRenderingStageView::DEFAULT_ROLE_MATERIAL = LibCarna::base::MeshRenderingMixin::ROLE_DEFAULT_MATERIAL;
209+
const unsigned int MeshRenderingStageView::DEFAULT_ROLE_MESH = LibCarna::base::MeshRenderingMixin::DEFAULT_ROLE_MESH;
210+
const unsigned int MeshRenderingStageView::DEFAULT_ROLE_MATERIAL = LibCarna::base::MeshRenderingMixin::DEFAULT_ROLE_MATERIAL;
211211

212212

213213
MeshRenderingStageView::MeshRenderingStageView( LibCarna::base::RenderStage* renderStage )

0 commit comments

Comments
 (0)