Bgroup

.gitignore

@@ -25,3 +25,4 @@ build
 .coverage
 .pytest_cache/
 htmlcov/
+.idea/

README.md

@@ -8,3 +8,58 @@ conda install --file requirements.txt -y
 pip install -e .
 
 pytest --cov-report=html --cov=relaxrender --ignore=tests/test_relaxrender.py tests
+
+
+
+注明：
+
+若遇到找不到模块，或许可以采用如下运行方法，详细请看Python包管理相关知识
+
+**Windows 运行方法之一：**
+
+打开 cmd , cd 到项目根目录，之后设置 临时环境变量 PYTHONPATH 为当前目录，之后在根目录运行你的文件
+
+
+示例：
+
+```
+# cmd
+D:   # 磁盘号
+cd <项目根目录>
+set PYTHONPATH=<relaxrender绝对目录>
+python <文件路径>
+```
+
+**Linux 运行文件方法之一：**
+
+```
+cd <项目根目录>
+export PYTHONPATH=<relaxrender绝对目录>
+python3 <文件路径>
+```
+
+### 代码量统计并排名
+
+在 bash 下运行如下命令，即可生成 statistics.txt （按照代码量排名）
+
+```shell
+git log --format='%aN' | sort -r -u | while read name; do echo -en "$name\t"; git log --author="$name" --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s, removed lines: %s, total lines: %s\n", add, subs, loc }' -; done | sort -n -r -k 4 -t: > statistics.txt
+```
+
+若想直接观看，可以直接运行如下命令：
+
+```shell
+git log --format='%aN' | sort -r -u | while read name; do echo -en "$name\t"; git log --author="$name" --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s, removed lines: %s, total lines: %s\n", add, subs, loc }' -; done | sort -n -r -k 4 -t: 
+```
+
+示例如下：
+
+```
+pipehappy	added lines: 1844, removed lines: 0, total lines: 1844
+tofar	added lines: 29, removed lines: 0, total lines: 29
+pipehappy1	added lines: 21, removed lines: 0, total lines: 21
+Liujiaohan	added lines: 8, removed lines: 0, total lines: 8
+molscar	added lines: 4, removed lines: 0, total lines: 4
+wenjiewang98228	added lines: 3, removed lines: 2, total lines: 1
+```
+

features/QMC/halftone.py

@@ -0,0 +1,140 @@
+import PIL.Image as Image
+import PIL.ImageDraw as ImageDraw
+import PIL.ImageStat as ImageStat
+import os
+
+"""
+The bulk of this is taken from this Stack Overflow answer by fraxel:
+http://stackoverflow.com/a/10575940/250962
+"""
+
+
+class Halftone:
+    def __init__(self, path):
+        """
+        :param path: eg: ./src/1.jpeg
+        """
+        self.path = path
+
+    def make(self, sample=10, scale=1, angles=[0, 15, 30, 45], antialias=False, style='color', percentage=0,filename_add='_halftoned'):
+        """
+            sample: 原始图像中的样本框大小（以像素为单位）。
+            scale: 最大输出点直径是样本*比例
+            angles: 每个屏幕通道应旋转4个角度的列表
+            style: '颜色'或'灰度'
+            antialias: true or false
+            percentage: 从CMY频道中删除多少灰色分量并放入K频道
+            filename_add: 输出文件名
+        """
+
+        # try:
+        im = Image.open(self.path)
+        # except IOError:
+            # print("Cannot open such image...")
+            # raise
+
+        if style == 'grayscale':
+            angles = angles[:1]
+            gray_im = im.convert('L')  # mode:8位像素
+            dots = self.halftone(gray_im, sample, scale, angles, antialias)
+            new = dots[0]
+
+        else:
+            cmyk_im = im.convert('CMYK')
+            cmyk_im_merge = self.gcr(cmyk_im, percentage)
+            dots = self.halftone(cmyk_im_merge, sample, scale, angles, antialias)
+            new = Image.merge('CMYK', dots)  # mode:4*8 位像素,颜色分离
+
+        f, e = os.path.splitext(self.path)
+        outfile = "%s%s%s" % (f, filename_add, e)
+        new.save(outfile)
+
+    def gcr(self, im, percentage):
+        """
+        gcr: 灰色组件更换
+            返回从CMY通道中移除百分比灰色分量的CMYK图像
+            并放入K频道，
+            percentage = 80, (30, 100, 255, 0) >> (6, 76, 231, 24)
+        """
+        if not percentage:
+            return im
+        cmyk_arr = im.split()
+        cmyk = []
+        for i in range(4):
+            cmyk.append(cmyk_arr[i].load())
+        for x in range(im.size[0]):  # for x axis pixels
+            for y in range(im.size[1]):  # for y axis pixels
+                gray = min(cmyk[0][x, y], cmyk[1][x, y], cmyk[2][x, y]) * percentage / 100
+                for i in range(3):
+                    cmyk[i][x, y] -= int(gray)
+                cmyk[3][x, y] = int(gray)
+        return Image.merge('CMYK', cmyk_arr)
+
+    def halftone(self, cmyk, sample, scale, angles, antialias):
+        """
+         返回cmyk图像的半色调图像列表。
+         因此，样品= 1将保留原始图像分辨率，
+        （但尺度必须大于1以允许点尺寸的变化）。
+        """
+        if antialias is True:
+            antialias_scale = 4
+            # 按照这个比例乘以图像的大小
+            # 在合并时绘制和缩小
+            scale *= antialias_scale
+
+        dots = []
+
+        for channel, angle in zip(cmyk.split(), angles):
+            channel = channel.rotate(angle, expand=1)
+            size = channel.size[0] * scale, channel.size[1] * scale
+            half_tone = Image.new('L', size)
+            draw = ImageDraw.Draw(half_tone)
+            # 一次循环一个采样点，为每个采样点绘制一个圆圈：
+            for x in range(0, channel.size[0], sample):
+                for y in range(0, channel.size[1], sample):
+                    # 我们抽样得到的等级：
+                    box = channel.crop((x, y, x + sample, y + sample))
+
+                    # 该框的平均等级（0-255）
+                    mean = ImageStat.Stat(box).mean[0]
+
+                    # 根据平均值绘制的圆的直径（0-1）：
+                    diameter = (mean / 255) ** 0.5
+
+                    # 我们将在此框中绘制圆框的大小：
+                    box_size = sample * scale
+
+                    # 我们将绘制的圆的直径：
+                    #如果sample = 10且scale = 1，则这是（0-10）
+                    draw_diameter = diameter * box_size
+
+                    # 框左上角的位置，我们将在下面画圆：
+                    # x_pos, y_pos = (x * scale), (y * scale)
+                    box_x, box_y = (x * scale), (y * scale)
+
+                    # 位于圈子的左上角和右下角：
+                    #最大尺寸的圆将在其边缘有边缘绘图框的＃号
+                    x1 = box_x + ((box_size - draw_diameter) / 2)
+                    y1 = box_y + ((box_size - draw_diameter) / 2)
+                    x2 = x1 + draw_diameter
+                    y2 = y1 + draw_diameter
+
+                    draw.ellipse([(x1, y1), (x2, y2)], fill=255)
+
+            half_tone = half_tone.rotate(-angle, expand=1)
+            width_half, height_half = half_tone.size
+
+            # 要裁剪的图像的左上角和右下角：
+            xx1 = (width_half - cmyk.size[0] * scale) / 2
+            yy1 = (height_half - cmyk.size[1] * scale) / 2
+            xx2 = xx1 + cmyk.size[0] * scale
+            yy2 = yy1 + cmyk.size[1] * scale
+
+            half_tone = half_tone.crop((xx1, yy1, xx2, yy2))
+
+            if antialias is True:
+                w = (xx2 - xx1) / antialias_scale
+                h = (yy2 - yy1) / antialias_scale
+                half_tone = half_tone.resize((int(w), int(h)), resample=Image.LANCZOS)
+            dots.append(half_tone)
+        return dots

features/QMC/readme.md

@@ -0,0 +1,11 @@
+Quasi-Monte Carlo   b组
+
+用拟蒙特卡罗方法实现半色调技术
+
+仓库链接 https://github.com/lqm0408/relaxrender
+
+组长 ：罗清明 lqm0408
+组员 ：刘笛 Teresa9907
+       杨雨欣 yuxinyyy
+       张欣萌 zxm1114
+       王帅帅 QQ1820621360

features/QMC/test_halfton.py

@@ -0,0 +1,11 @@
+import unittest
+import halftone
+
+class Testhalftone(unittest.TestCase):
+    def testhalftone_gray(self):
+        h = halftone.Halftone('1.jpg')
+        h.make(style='grayscale',filename_add='1')
+    def testOthers(self):
+        h = halftone.Halftone('1.jpg')
+        h.make(style='color',filename_add='4',percentage=100,antialias=True)
+        h.make(style='color',filename_add='5',percentage=0,antialias=True)

features/README.md

@@ -0,0 +1,6 @@
+每个小组根据自己的feature新建一个文件夹，在该文件夹下进行开发,要求有readme和test文件   
+例：teapot---|--- README.md
+
+	     |--- render.py
+
+	     |--- test__xxx.py

features/bumping-map/README.md

@@ -0,0 +1,9 @@
+add test file test_bumping_map.py
+
+add code file bumping_map.py
+
+add picture normal.png
+
+All the paths in this project are relative.
+
+Note:normal.png is needed for bumping_map.py. If you want to change the file catalog, please remodify the file path in bumping_map.py.

features/bumping-map/bumping_map.py

@@ -0,0 +1,152 @@
+from functools import reduce
+import numpy as np
+import time
+import numbers
+import imageio
+import random
+
+def extract(cond, x):
+    if isinstance(x, numbers.Number):
+        return x
+    else:
+        return np.extract(cond, x)
+
+class vec3():
+    def __init__(self, x, y, z):
+        (self.x, self.y, self.z) = (x, y, z)
+    def __mul__(self, other):
+        return vec3(self.x * other, self.y * other, self.z * other)
+    def __add__(self, other):
+        return vec3(self.x + other.x, self.y + other.y, self.z + other.z)
+    def __sub__(self, other):
+        return vec3(self.x - other.x, self.y - other.y, self.z - other.z)
+    def dot(self, other):
+        return (self.x * other.x) + (self.y * other.y) + (self.z * other.z)
+    def __abs__(self):
+        return self.dot(self)
+    def norm(self):
+        mag = np.sqrt(abs(self))
+        return self * (1.0 / np.where(mag == 0, 1, mag))
+    def components(self):
+        return (self.x, self.y, self.z)
+    def extract(self, cond):
+        return vec3(extract(cond, self.x),
+                    extract(cond, self.y),
+                    extract(cond, self.z))
+    def place(self, cond):
+        r = vec3(np.zeros(cond.shape), np.zeros(cond.shape), np.zeros(cond.shape))
+        np.place(r.x, cond, self.x)
+        np.place(r.y, cond, self.y)
+        np.place(r.z, cond, self.z)
+        return r
+rgb = vec3
+
+(w, h) = (800, 600)         #图片大小
+L = vec3(0, 0.9, 1)        #光源位置
+E = vec3(0., 0.35, -1)     #视野位置
+FARAWAY = 1.0e39            #无限长度
+
+#读取法线贴图
+normalsource = imageio.imread(r"normal.png");
+normalMap = np.array(normalsource)
+#取法线贴图分量
+normalX = normalsource.take([0], axis = 2)
+normalX = np.array(normalX).reshape(normalX.size)
+normalY = normalsource.take([1], axis = 2)
+normalY = np.array(normalY).reshape(normalY.size)
+normalZ = normalsource.take([2], axis = 2)
+normalZ = np.array(normalZ).reshape(normalZ.size)
+#输出测试
+print (normalX)
+print (normalY)
+print (normalZ)
+#将法线贴图的数据转化为归一化的法线数据
+normalX = (normalX * 2 / 255) - 1
+normalY = (normalY * 2 / 255) - 1
+normalZ = (normalZ * 2 / 255) - 1
+#输出测试
+print (normalX.size)
+print (normalY.size)
+print (normalZ.size)
+
+def raytrace(O, D, scene, bounce = 0):
+    distances = [s.intersect(O, D) for s in scene]
+    nearest = reduce(np.minimum, distances)
+    color = rgb(0, 0, 0)
+    for (sphere, d) in zip(scene, distances):
+        hit = (nearest != FARAWAY) & (d == nearest)
+        if np.any(hit):
+            dc = extract(hit, d)
+            Oc = O.extract(hit)
+            Dc = D.extract(hit)
+            cc = sphere.light(Oc, Dc, dc, scene, bounce)
+            color += cc.place(hit)
+    return color
+
+class Sphere:
+    def __init__(self, center, r, diffuse, mirror = 0.5):
+        self.c = center
+        self.r = r
+        self.diffuse = diffuse
+        self.mirror = mirror
+        Sphere.countX = 0
+        Sphere.countY = 0
+        Sphere.countZ = 0
+
+
+    def intersect(self, O, D):
+        b = 2 * D.dot(O - self.c)
+        c = abs(self.c) + abs(O) - 2 * self.c.dot(O) - (self.r * self.r)
+        disc = (b ** 2) - (4 * c)
+        sq = np.sqrt(np.maximum(0, disc))
+        h0 = (-b - sq) / 2
+        h1 = (-b + sq) / 2
+        h = np.where((h0 > 0) & (h0 < h1), h0, h1)
+        pred = (disc > 0) & (h > 0)
+        return np.where(pred, h, FARAWAY)
+
+    def diffusecolor(self, M):
+        return self.diffuse
+
+    def light(self, O, D, d, scene, bounce):
+        M = (O + D * d)                         # 交点
+        N = (M - self.c) * (1. / self.r)
+        normal_x = normalX[0:97012]
+        normal_y = normalY[0:97012]
+        normal_z = normalZ[0:97012]
+
+        N = vec3(normal_x, normal_y, normal_z)
+        toL = (L - M).norm()                    # 光线方向
+        toO = (E - M).norm()                    # 视野射线方向
+        nudged = M + N * .0001
+
+        # 阴影并计算交点是否在阴影内
+        light_distances = [s.intersect(nudged, toL) for s in scene]
+        light_nearest = reduce(np.minimum, light_distances)
+        seelight = light_distances[scene.index(self)] == light_nearest
+
+        # 环境光
+        color = rgb(0.05, 0.05, 0.05)
+
+        #兰伯特光照
+        lv = np.maximum(N.dot(toL) * -1, 0)
+        color += self.diffusecolor(M) * lv * seelight
+        return color
+def draw():
+    scene = [ Sphere(vec3(0, .1, .5), .6, rgb(0.7, 0.7, 0.7))]
+
+    r = float(w) / h
+    S = (-1., 1. / r + .25, 1., -1. / r + .25)
+    x = np.tile(np.linspace(S[0], S[2], w), h)
+    y = np.repeat(np.linspace(S[1], S[3], h), w)
+
+    t0 = time.time()
+    Q = vec3(x, y, 0)
+    color = raytrace(E, (Q - E).norm(), scene)
+    print("Took", time.time() - t0)
+    l=[]
+    for c in color.components():
+        l.append((255 * np.clip(c, 0, 1).reshape((h, w))) .astype(np.uint8))
+    output=np.array(list(list([l[0][i][j],l[1][i][j],l[2][i][j]] for j in range(len(l[0][0]))) for i in range(len(l[0]))))
+    imageio.imwrite(r"output.png",output)
+    return 1