Abstract: We present novel methods to enhance Computer Generated Holography (CGH) by introducing a complex-valued wave-based occlusion handling method. This offers a very intuitive and efficient interface to introduce optical elements featuring physically-based light interaction exhibiting depth-of-field, diffraction, and glare effects. Fur-thermore, an efficient and flexible evaluation of lit objects on a full-parallax hologram leads to more convincing images. Previous illumination methods for CGH are not able to change the illumination settings of rendered holo-grams. In this paper we propose a novel method for real-time lighting of rendered holograms in order to change the appearance of a previously captured holographic scene. These functionalities are features of a bigger wave-based rendering framework which can be combined with 2D framebuffer graphics. We present an algorithm which uses graphics hardware to accelerate the rendering.