Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to art #8

Merged
merged 15 commits into from
Dec 15, 2021
Merged

Update to art #8

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
39d30a7
Create gltf_read.cpp
volivarez60 Oct 19, 2021
9e6fb7a
updated appleseed cmake so that it points to correct files when setti…
f4alt Oct 20, 2021
4685902
art update and testing dump - I should've been incrementally pushing …
f4alt Nov 2, 2021
c8e809f
implement tree walk to itemize pieces of geometry and pull out rgb co…
f4alt Nov 9, 2021
1470266
debugging why render does not maintain orientation. Bounding box now …
f4alt Nov 11, 2021
5c8e6c8
this got wrapped in here by mistake - removing
f4alt Nov 16, 2021
c30ecc3
this file was for testing - should never have been committed
f4alt Nov 16, 2021
12fa27e
comment cleanup
f4alt Nov 16, 2021
f6608a3
Revert "comment cleanup"
f4alt Nov 16, 2021
e1c789c
comment and spacing cleanup. Added use comments
f4alt Nov 16, 2021
00f1a64
include usage.cpp and stub minimal tables to support -c set samples=x
f4alt Nov 18, 2021
15f4283
support set command to specify samples when running. Option menu from…
f4alt Nov 19, 2021
5860401
Merge pull request #3 from treydinges/chris-appleseed-options-menu
f4alt Nov 19, 2021
8eeba1a
remove redundant file
f4alt Nov 19, 2021
50e5cda
update cmake to set a APPLESEED_ROOT var when successfully compiling …
f4alt Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions misc/CMake/FindAppleseed.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,15 @@ find_path (Appleseed_INCLUDE_DIR renderer/api/project.h
${Appleseed_ROOT}
PATH_SUFFIXES
include
appleseed/include
)

find_library (Appleseed_LIBRARY
NAMES appleseed
NAMES Appleseed
HINTS
${Appleseed_ROOT}
PATH_SUFFIXES
lib64
lib
lib64
)

# Handle the QUIETLY and REQUIRED arguments and set Appleseed_FOUND.
Expand Down
3 changes: 3 additions & 0 deletions src/art/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ set(ART_INCLUDE_DIRS
${OPTICAL_INCLUDE_DIRS}
${FB_INCLUDE_DIRS}
${RT_INCLUDE_DIRS}
${GED_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
)

Expand All @@ -10,6 +11,7 @@ BRLCAD_INCLUDE_DIRS(ART_INCLUDE_DIRS)

set(RT_STD_LIBS
Threads::Threads
libged
librt
libnmg
libdm
Expand Down Expand Up @@ -44,6 +46,7 @@ if(Appleseed_FOUND)
art.cpp
brlcadplugin.cpp
../rt/opt.c
../rt/usage.cpp
)

BRLCAD_ADDEXEC(art "${ART_SRCS}" "${RT_STD_LIBS};${Appleseed_LIBRARIES};${Appleseed_BOOST_SYSTEM_LIB};${Appleseed_OPENIMAGEIO_LIB}" TEST_USESDATA)
Expand Down
Loading