Skip to content

Updated includes and booleans to latest available #15

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

Open
raellic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated includes and booleans to latest available #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion blackbody.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import numpy as np
import scipy.misc as spm
import imageio

#accretion disk log temperature profile (R^{-3/4})
LOGSHIFT = 0.823959216501 # 3/4 log(3)
Expand All @@ -25,7 +26,7 @@ def intensity(T):
return 1./( np.exp(29622.4 / T.clip(1.)) - 1)


ramp = spm.imread('data/colourtemp.jpg')[0,:,:]/255.
ramp = imageio.imread('data/colourtemp.jpg')[0,:,:]/255.
rampsz = ramp.shape[0]


Expand Down
24 changes: 14 additions & 10 deletions tracer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import scipy.misc as spm
import random,sys,time,os
import datetime
import imageio
from PIL import Image

import multiprocessing as multi
import ctypes
Expand Down Expand Up @@ -313,7 +315,7 @@ def rgbtosrgb(arr):
arr[mask] **= 1/2.4
arr[mask] *= 1.055
arr[mask] -= 0.055
arr[-mask] *= 12.92
arr[~mask] *= 12.92


# convert from srgb to linear rgb
Expand All @@ -323,31 +325,33 @@ def srgbtorgb(arr):
arr[mask] += 0.055
arr[mask] /= 1.055
arr[mask] **= 2.4
arr[-mask] /= 12.92
arr[~mask] /= 12.92


logger.debug("Loading textures...")
if SKY_TEXTURE == 'texture':
texarr_sky = spm.imread('textures/bgedit.jpg')
texarr_sky = imageio.imread('textures/bgedit.jpg')
texarr_test = imageio.imread('textures/bgedit.jpg')
# must convert to float here so we can work in linear colour
texarr_sky = texarr_sky.astype(float)
texarr_sky /= 255.0
if SRGBIN:
# must do this before resizing to get correct results
srgbtorgb(texarr_sky)
if not LOFI:
#if not LOFI:
# maybe doing this manually and then loading is better.
logger.debug("(zooming sky texture...)")
texarr_sky = spm.imresize(texarr_sky,2.0,interp='bicubic')
# logger.debug("(zooming sky texture...)")
# newsize = (640,480)
# texarr_sky = texarr_sky.resize(newsize)
# imresize converts back to uint8 for whatever reason
texarr_sky = texarr_sky.astype(float)
texarr_sky /= 255.0
# texarr_sky = texarr_sky.astype(float)
# texarr_sky /= 255.0

texarr_disk = None
if DISK_TEXTURE == 'texture':
texarr_disk = spm.imread('textures/adisk.jpg')
texarr_disk = imageio.imread('textures/adisk.jpg')
if DISK_TEXTURE == 'test':
texarr_disk = spm.imread('textures/adisktest.jpg')
texarr_disk = imageio.imread('textures/adisktest.jpg')
if texarr_disk is not None:
# must convert to float here so we can work in linear colour
texarr_disk = texarr_disk.astype(float)
Expand Down