Differential D1166 Diff 5520 intern/cycles/util/util_hilbert.h

Changeset View

Standalone View

intern/cycles/util/util_hilbert.h

This file was added.

				/*
				* Copyright 2011-2015 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_HILBERT_H__
				#define __UTIL_HILBERT_H__
				sergeyUnsubmitted Not Done Inline Actions Did you consider calling it more generic, like `util_curve.h` or so? So we can add more curve-specific files here. Plus the file does not follow the code conventions. And one more thing, functions are to have `util_` prefix. sergey: Did you consider calling it more generic, like `util_curve.h` or so? So we can add more curve…

				#include "util_algorithm.h"

				CCL_NAMESPACE_BEGIN

				sergeyUnsubmitted Not Done Inline Actions Doesn't it seem generic enough to be a part of util_math? `inline` => `ccl_device_inline`. Same applies to cases below. sergey: Doesn't it seem generic enough to be a part of util_math? `inline` => `ccl_device_inline`.
				ccl_device_inline int hilbert_roundpow2(int v)
				{
				v--;
				v \|= v >> 1;
				v \|= v >> 2;
				v \|= v >> 4;
				v \|= v >> 8;
				v \|= v >> 16;
				v++;

				return v;
				sergeyUnsubmitted Not Done Inline Actions Would prefer something more verbose: /* Hilbert curve calculation functions * Based on code from * http://en.wikipedia.org/wiki/Hilbert_curve / Or just no need to bother with links. sergey:* Would prefer something more verbose: /* Hilbert curve calculation functions * Based on…
				}

				ccl_device_inline void hilbert_rot(int n, int x, int y, int rx, int ry)
				{
				if (ry == 0) {
				if (rx == 1) {
				x = n-1 - x;
				y = n-1 - y;
				sergeyUnsubmitted Not Done Inline Actions You can use `swap` from `util_algorithm.h`. sergey: You can use `swap` from `util_algorithm.h`.
				}

				swap(x, y);
				}
				}

				ccl_device_inline int hilbert_xy2d (int n, int x, int y)
				{
				sergeyUnsubmitted Not Done Inline Actions Spaces around operators seems inconsistent. sergey: Spaces around operators seems inconsistent.
				int rx, ry, s, d = 0;

				for(s = n/2; s > 0; s /= 2) {
				rx = (x & s) > 0;
				ry = (y & s) > 0;
				d += s * s * ((3 * rx) ^ ry);
				hilbert_rot(s, &x, &y, rx, ry);
				}
				return d;
				}

				ccl_device_inline void hilbert_d2xy(int n, int d, int x, int y) {
				int rx, ry, s, t=d;

				x = y = 0;
				for(s = 1; s < n; s *= 2) {
				rx = 1 & (t/2);
				ry = 1 & (t ^ rx);
				hilbert_rot(s, x, y, rx, ry);
				x += s rx;
				y += s ry;
				t /= 4;
				}
				}

				CCL_NAMESPACE_END

				#endif // __UTIL_HILBERT_H__