public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-05 16:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolved conflicts

Browse source
This commit is contained in:
Ben Hambrecht 2018-02-27 18:48:35 +01:00
parent 74742ce5b4
commit 342d6eaa82
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
camera/camera.py
View file

@ -438,12 +438,6 @@ class Camera(object):
] ]
out_a = src_a + dst_a*(1.0-src_a) out_a = src_a + dst_a*(1.0-src_a)
<<<<<<< HEAD
out_rgb = fdiv(
src_rgb*src_a[..., None] + \
dst_rgb*dst_a[..., None]*(1.0-src_a[..., None]),
out_a[..., None]
=======
# When the output alpha is 0 for full transparency, # When the output alpha is 0 for full transparency,
# we have a choice over what RGB value to use in our # we have a choice over what RGB value to use in our
@ -453,7 +447,6 @@ class Camera(object):
dst_rgb*dst_a[..., None]*(1.0-src_a[..., None]), dst_rgb*dst_a[..., None]*(1.0-src_a[..., None]),
out_a[..., None], out_a[..., None],
zero_over_zero_value = 0 zero_over_zero_value = 0
>>>>>>> master
) )
self.pixel_array[..., :3] = out_rgb*self.rgb_max_val self.pixel_array[..., :3] = out_rgb*self.rgb_max_val

7
helpers.py
View file

@ -693,11 +693,6 @@ class DictAsObject(object):
def __init__(self, dict): def __init__(self, dict):
self.__dict__ = dict self.__dict__ = dict
# Just to have a less heavyweight name for this extremely common operation
<<<<<<< HEAD
def fdiv(a, b):
return np.true_divide(a,b)
=======
# #
# We may wish to have more fine-grained control over division by zero behavior # We may wish to have more fine-grained control over division by zero behavior
# in the future (separate specifiable values for 0/0 and x/0 with x != 0), # in the future (separate specifiable values for 0/0 and x/0 with x != 0),
@ -711,7 +706,7 @@ def fdiv(a, b, zero_over_zero_value = None):
where = True where = True
return np.true_divide(a, b, out = out, where = where) return np.true_divide(a, b, out = out, where = where)
>>>>>>> master
def add_extension_if_not_present(file_name, extension): def add_extension_if_not_present(file_name, extension):
# This could conceivably be smarter about handling existing differing extensions # This could conceivably be smarter about handling existing differing extensions