Skip to content

Commit a2feb40

Browse files
committed
Merge with przemog nabla
2 parents fc420a6 + 8007a9a commit a2feb40

File tree

999 files changed

+19668
-17260
lines changed

Some content is hidden

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

999 files changed

+19668
-17260
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Bug report
3+
about: Report a bug or problem encountered while using Nabla
4+
labels: bug
5+
---
6+
7+
## Describe the bug
8+
<!-- A clear and concise description of what the bug is. -->
9+
10+
## Steps to Reproduce
11+
<!-- Please describe how the bug you've encountered can be reproduced -->
12+
13+
## Expected vs observed behavior
14+
<!-- Clearly describe what you get, and how it goes across your expectations. -->
15+
16+
## Environment
17+
<!-- Please provide the following information -->
18+
19+
* **OS:**
20+
* **CPU:**
21+
* **GPU:**
22+
* **GPU driver version:**
23+
* **Compiler:**
24+
* **branch:**
25+
* **commit hash:**
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
labels: enhancement
5+
---
6+
7+
## Description
8+
<!-- Please describe your suggestion -->
9+
10+
## Description of the related problem
11+
<!-- Is your feature request related to a problem? Please provide
12+
A clear and concise description of what the problem is. -->
13+
14+
## Solution proposal
15+
<!-- A clear and concise description of what you want to happen. -->
16+
17+
## Additional context
18+
<!-- Add any other context or screenshots about the feature request here. -->
19+
20+
21+

.github/pull_request_template.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## Description
2+
<!-- Describe what problem this is solving, and how it's solved. -->
3+
4+
## Testing
5+
<!-- Explain how this change was tested. -->
6+
7+
## TODO list:
8+
<!-- A list of things that have to be finished before this PR can be merged -->
9+
10+
<!--
11+
By creating this pull request into Nabla, you agree to release all your past (even from previous commits) and present contributions in the Nabla repository under the Apache 2.0 license. If you're not the sole contributor, ensure that all contributors have signed the CLA agreeing to this.
12+
-->
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: repo_mirroring
2+
3+
on:
4+
schedule:
5+
- cron: "*/60 * * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
repo-sync:
10+
runs-on: self-hosted
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
persist-credentials: false
15+
- name: repo-sync-master
16+
uses: repo-sync/github-sync@v2
17+
with:
18+
source_repo: "buildaworldnet/IrrlichtBAW"
19+
source_branch: "master"
20+
destination_branch: "master_irrlichtbaw"
21+
github_token: ${{ secrets.GITHUB_TOKEN }}
22+
- name: repo-sync-shader-pipeline
23+
uses: repo-sync/github-sync@v2
24+
with:
25+
source_repo: "buildaworldnet/IrrlichtBAW"
26+
source_branch: "shader_pipeline"
27+
destination_branch: "shader_pipeline_irrlichtbaw"
28+
github_token: ${{ secrets.GITHUB_TOKEN }}

3rdparty/CMakeLists.txt

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
# Copyright (c) 2019 DevSH Graphics Programming Sp. z O.O.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
1+
# Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
2+
# This file is part of the "Nabla Engine".
3+
# For conditions of distribution and use, see copyright notice in nabla.h
144

155
include(../cmake/common.cmake)
166

@@ -34,6 +24,7 @@ update_git_submodule(./openssl)
3424
update_git_submodule(./libjpeg-turbo)
3525
update_git_submodule(./libjpeg) # soon to be killed
3626
update_git_submodule(./parallel-hashmap)
27+
update_git_submodule(./gli)
3728
# exceptions that get automatically cloned
3829
update_git_submodule(./glm)
3930
update_git_submodule(./freetype2)
@@ -180,8 +171,8 @@ set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
180171
set(BUILD_TESTING ${_OLD_BUILD_TESTING})
181172

182173
#gli
183-
option(_IRR_COMPILE_WITH_GLI_ "Build with GLI library" ON)
184-
if(_IRR_COMPILE_WITH_GLI_)
174+
option(_NBL_COMPILE_WITH_GLI_ "Build with GLI library" ON)
175+
if(_NBL_COMPILE_WITH_GLI_)
185176
set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
186177
set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
187178
set(_OLD_BUILD_TESTING ${BUILD_TESTING})
@@ -194,7 +185,7 @@ if(_IRR_COMPILE_WITH_GLI_)
194185
set(BUILD_TESTING ${_OLD_BUILD_TESTING})
195186
endif()
196187

197-
irr_adjust_flags()
188+
nbl_adjust_flags()
198189

199190
add_library(lzma OBJECT
200191
lzma/C/Alloc.c
@@ -247,13 +238,13 @@ add_library(aesGladman OBJECT
247238
aesGladman/sha1.c
248239
)
249240

250-
if (IRR_BUILD_CEGUI) # I absolutely hate and despise GLM
241+
if (NBL_BUILD_CEGUI) # I absolutely hate and despise GLM
251242
set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
252243
set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
253244
set(BUILD_SHARED_LIBS OFF)
254245
set(BUILD_STATIC_LIBS OFF)
255246
option(GLM_TEST_ENABLE_CXX_14 "Enable C++ 14" ON)
256-
if (IRR_FAST_MATH)
247+
if (NBL_FAST_MATH)
257248
option(GLM_TEST_ENABLE_FAST_MATH "Enable fast math optimizations" ON)
258249
endif()
259250
option(GLM_TEST_ENABLE_SIMD_SSE4_2 "Enable SSE 4.2 optimizations" ON)
@@ -269,7 +260,7 @@ option(GLM_TEST_ENABLE "Build unit tests" OFF)
269260
set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
270261
set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
271262

272-
if (IRR_BUILD_MITSUBA_LOADER)
263+
if (NBL_BUILD_MITSUBA_LOADER)
273264
update_git_submodule(./libexpat)
274265

275266
option(BUILD_tools "EXPAT: build the xmlwf tool for expat library" OFF)
@@ -292,7 +283,7 @@ if (IRR_BUILD_MITSUBA_LOADER)
292283
set(MITSUBA_LOADER_DEPENDENT_LIBS ${MITSUBA_LOADER_DEPENDENT_LIBS} PARENT_SCOPE)
293284
endif()
294285

295-
if (IRR_BUILD_CEGUI)
286+
if (NBL_BUILD_CEGUI)
296287
update_git_submodule(./libexpat)
297288
update_git_submodule(./CEGUI/pcre)
298289
update_git_submodule(./CEGUI/glew)
@@ -349,77 +340,77 @@ if (IRR_BUILD_CEGUI)
349340
#[[ unsure if needed for now
350341
install(
351342
DIRECTORY ${CEGUI_DEPS_INSTALL_PATH}/include/
352-
DESTINATION ./include/irr/ext/CEGUI/3rdparty
343+
DESTINATION ./include/nbl/ext/CEGUI/3rdparty
353344
CONFIGURATIONS Release
354345
)
355346
install(
356347
DIRECTORY ${CEGUI_DEPS_INSTALL_PATH}/include/
357-
DESTINATION ./debug/include/irr/ext/CEGUI/3rdparty
348+
DESTINATION ./debug/include/nbl/ext/CEGUI/3rdparty
358349
CONFIGURATIONS Debug
359350
)
360351
install(
361352
DIRECTORY ${CEGUI_DEPS_INSTALL_PATH}/lib/
362-
DESTINATION ./lib/irr/ext/CEGUI
353+
DESTINATION ./lib/nbl/ext/CEGUI
363354
CONFIGURATIONS Release
364355
)
365356
install(
366357
DIRECTORY ${CEGUI_DEPS_INSTALL_PATH}/lib/
367-
DESTINATION ./debug/lib/irr/ext/CEGUI
358+
DESTINATION ./debug/lib/nbl/ext/CEGUI
368359
CONFIGURATIONS Debug
369360
)
370361
]]#
371362

372363
# CEGUI headers
373364
install(
374365
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/CEGUI/cegui/cegui/include/CEGUI
375-
DESTINATION ./include/irr/ext/CEGUI
366+
DESTINATION ./include/nbl/ext/CEGUI
376367
CONFIGURATIONS Release
377368
)
378369
install(
379370
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/CEGUI/cegui/cegui/include/CEGUI
380-
DESTINATION ./debug/include/irr/ext/CEGUI
371+
DESTINATION ./debug/include/nbl/ext/CEGUI
381372
CONFIGURATIONS Debug
382373
)
383374
install(
384375
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/CEGUI/cegui/cegui/include/CEGUI
385-
DESTINATION ./relwithdebinfo/include/irr/ext/CEGUI
376+
DESTINATION ./relwithdebinfo/include/nbl/ext/CEGUI
386377
CONFIGURATIONS RelWithDebInfo
387378
)
388379
# CEGUI generated headers
389380
install(
390381
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CEGUI/cegui/cegui/include/CEGUI
391-
DESTINATION ./include/irr/ext/CEGUI
382+
DESTINATION ./include/nbl/ext/CEGUI
392383
CONFIGURATIONS Release
393384
)
394385
install(
395386
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CEGUI/cegui/cegui/include/CEGUI
396-
DESTINATION ./debug/include/irr/ext/CEGUI
387+
DESTINATION ./debug/include/nbl/ext/CEGUI
397388
CONFIGURATIONS Debug
398389
)
399390
install(
400391
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CEGUI/cegui/cegui/include/CEGUI
401-
DESTINATION ./relwithdebinfo/include/irr/ext/CEGUI
392+
DESTINATION ./relwithdebinfo/include/nbl/ext/CEGUI
402393
CONFIGURATIONS RelWithDebInfo
403394
)
404395
# CEGUI libs
405396
install(
406397
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CEGUI/cegui/lib/
407-
DESTINATION ./lib/irr/ext/CEGUI
398+
DESTINATION ./lib/nbl/ext/CEGUI
408399
CONFIGURATIONS Release
409400
)
410401
install(
411402
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CEGUI/cegui/lib/
412-
DESTINATION ./debug/lib/irr/ext/CEGUI
403+
DESTINATION ./debug/lib/nbl/ext/CEGUI
413404
CONFIGURATIONS Debug
414405
)
415406
install(
416407
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CEGUI/cegui/lib/
417-
DESTINATION ./relwithdebinfo/lib/irr/ext/CEGUI
408+
DESTINATION ./relwithdebinfo/lib/nbl/ext/CEGUI
418409
CONFIGURATIONS RelWithDebInfo
419410
)
420411
endif()
421412

422-
if (IRR_BUILD_RADEON_RAYS)
413+
if (NBL_BUILD_RADEON_RAYS)
423414
update_git_submodule(./radeonrays)
424415

425416
option(RR_NO_TESTS "RADEON_RAYS: don't do tests" ON)
@@ -439,7 +430,7 @@ if (IRR_BUILD_RADEON_RAYS)
439430
set(RADEON_RAYS_DEPENDENT_LIBS ${RADEON_RAYS_DEPENDENT_LIBS} PARENT_SCOPE)
440431
endif()
441432

442-
if (IRR_BUILD_BULLET)
433+
if (NBL_BUILD_BULLET)
443434
update_git_submodule(./bullet3)
444435
set(BULLET_INCLUDE_PATH
445436
${CMAKE_CURRENT_SOURCE_DIR}/bullet3/src
@@ -449,11 +440,11 @@ if (IRR_BUILD_BULLET)
449440
endif()
450441

451442

452-
if (IRR_COMPILE_WITH_CUDA)
443+
if (NBL_COMPILE_WITH_CUDA)
453444
update_git_submodule(./jitify)
454445
endif()
455446

456-
set(IRR_3RDPARTY_TARGETS
447+
set(NBL_3RDPARTY_TARGETS
457448
lzma
458449
lz4
459450
aesGladman
@@ -480,13 +471,16 @@ set(IRR_3RDPARTY_TARGETS
480471
SPIRV-Tools
481472
SPIRV-Tools-opt )
482473
#TODO insert more targets that are conditionally built
483-
if (IRR_BUILD_MITSUBA_LOADER)
484-
list(APPEND IRR_3RDPARTY_TARGETS expat)
474+
if (NBL_BUILD_MITSUBA_LOADER)
475+
list(APPEND NBL_3RDPARTY_TARGETS expat)
476+
endif()
477+
if (NBL_BUILD_RADEON_RAYS)
478+
list(APPEND NBL_3RDPARTY_TARGETS RadeonRays CLW Calc)
485479
endif()
486480
if(ENABLE_HLSL)
487-
list(APPEND IRR_3RDPARTY_TARGETS HLSL)
481+
list(APPEND NBL_3RDPARTY_TARGETS HLSL)
488482
endif()
489-
foreach(trgt IN LISTS IRR_3RDPARTY_TARGETS)
483+
foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
490484
set_property(TARGET ${trgt} PROPERTY
491485
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
492486
endforeach()
@@ -507,4 +501,4 @@ install(
507501
DIRECTORY ./parallel-hashmap/parallel_hashmap
508502
DESTINATION ./relwithdebinfo/include/parallel-hashmap
509503
CONFIGURATIONS RelWithDebInfo
510-
)
504+
)

0 commit comments

Comments
 (0)