Add more ray attribute for self-intersection check. Remove unsed code.
Add more ray attribute for self-intersection check.
Remove unsed code.

avr-aics-riken/SURFACE,avr-aics-riken/SURFACE,avr-aics-riken/SURFACE,avr-aics-riken/SURFACE