diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-11-13 23:59:54 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-11-13 23:59:54 +0300 |
commit | ca21b0702cb62a9c4be893519254854575e8cb2f (patch) | |
tree | bd68af3eb5aa9b83f6376ac0059635dc6f864e28 | |
parent | 28f4388c2ee815998141f0e4a5a671dec27354e3 (diff) |
Removed unused util_volume files.
-rw-r--r-- | intern/cycles/kernel/geom/geom_volume.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_compat_cpu.h | 1 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/render/volume.h | 1 | ||||
-rw-r--r-- | intern/cycles/util/CMakeLists.txt | 10 | ||||
-rw-r--r-- | intern/cycles/util/util_volume.cpp | 19 | ||||
-rw-r--r-- | intern/cycles/util/util_volume.h | 61 |
7 files changed, 8 insertions, 92 deletions
diff --git a/intern/cycles/kernel/geom/geom_volume.h b/intern/cycles/kernel/geom/geom_volume.h index 8274d19aba2..841f1218e7e 100644 --- a/intern/cycles/kernel/geom/geom_volume.h +++ b/intern/cycles/kernel/geom/geom_volume.h @@ -14,6 +14,10 @@ * limitations under the License. */ +#ifdef WITH_OPENVDB +#include "../openvdb/vdb_thread.h" +#endif + /* Volume Primitive * * Volumes are just regions inside meshes with the mesh surface as boundaries. diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index d51a0c59fa4..dfcfcba2a40 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -41,7 +41,6 @@ #include "util_half.h" #include "util_types.h" #include "util_texture.h" -#include "util_volume.h" #define ccl_addr_space diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 3045800591b..e9b6cdf25d6 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -30,6 +30,10 @@ #include "util_foreach.h" #include "util_transform.h" +#ifdef WITH_OPENVDB +#include "../kernel/openvdb/vdb_thread.h" +#endif + CCL_NAMESPACE_BEGIN /* Texture Mapping */ diff --git a/intern/cycles/render/volume.h b/intern/cycles/render/volume.h index 537896591fd..d08c6527147 100644 --- a/intern/cycles/render/volume.h +++ b/intern/cycles/render/volume.h @@ -21,7 +21,6 @@ #include "util_string.h" #include "util_types.h" -#include "util_volume.h" #ifdef WITH_OPENVDB #include <openvdb/openvdb.h> diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index f9c7c7350e2..02ee4cd6774 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -81,20 +81,10 @@ set(SRC_HEADERS util_vector.h util_version.h util_view.h - util_volume.h util_windows.h util_xml.h ) -if(WITH_OPENVDB) - add_definitions( - -DWITH_OPENVDB - ) - list(APPEND SRC - util_volume.cpp - ) -endif() - include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) diff --git a/intern/cycles/util/util_volume.cpp b/intern/cycles/util/util_volume.cpp deleted file mode 100644 index d2f02071ab6..00000000000 --- a/intern/cycles/util/util_volume.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "util_volume.h" - -#include <cstdio> diff --git a/intern/cycles/util/util_volume.h b/intern/cycles/util/util_volume.h deleted file mode 100644 index 1621d84b828..00000000000 --- a/intern/cycles/util/util_volume.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __UTIL_VOLUME_H__ -#define __UTIL_VOLUME_H__ - -#include "util_types.h" - -#include "../kernel/kernel_types.h" - -#ifdef WITH_OPENVDB -#include "../kernel/openvdb/vdb_thread.h" -#endif - -CCL_NAMESPACE_BEGIN - -#if 0 -struct KernelGlobals; -struct Ray; -struct Intersection; - -class float_volume { -public: - virtual ~float_volume() {} -#if 0 - virtual float sample(float x, float y, float z, int sampling) = 0; - virtual bool intersect(const Ray *ray, float *isect_t) = 0; - virtual bool march(float *t0, float *t1) = 0; - virtual bool has_uniform_voxels() = 0; -#endif -}; - -class float3_volume { -public: - virtual ~float3_volume() {} -#if 0 - virtual float3 sample(float x, float y, float z, int sampling) = 0; - virtual bool intersect(const Ray *ray, float *isect_t) = 0; - virtual bool march(float *t0, float *t1) = 0; - virtual bool has_uniform_voxels() = 0; -#endif -}; -#endif - -CCL_NAMESPACE_END - -#endif /* __UTIL_VOLUME_H__ */ - |