Paste Code
Paste Blends
Paste Images
Common subdirectories: render_3delight/preview and render_3delight_orig/preview
diff render_3delight/properties.py render_3delight_orig/properties.py
708,719d707
<
< nsamples = IntProperty(
< name="nsamples",
< description="Number of samples for AreaLight",
< min=1,max=128,default=32)
<
< samplingstrategy = EnumProperty(
< name="Sampling strategy",
< description="How to sample the AreaLight",
< items=[('lightsource','LightSource','Average Lightpoint, faster'),
< ('illuminance','Illuminance','Illuminance, better, physical correct')],
< default='lightsource')
diff render_3delight/render.py render_3delight_orig/render.py
562c562
< file.write(' LightSource "%s" ' % rm.light_shaders.active)
---
> file.write(' LightSource "%s" \n' % rm.light_shaders.active)
567c567
< file.write(' LightSource "pointlight" ')
---
> file.write(' LightSource "pointlight" \n')
572c572
< file.write(' LightSource "shadowspot" ')
---
> file.write(' LightSource "shadowspot" \n')
576c576
< file.write(' LightSource "spotlight" ')
---
> file.write(' LightSource "spotlight" \n')
580c580
< file.write(' LightSource "h_distantshadow" ')
---
> file.write(' LightSource "h_distantshadow" \n')
584c584
< file.write(' LightSource "ambientlight" ')
---
> file.write(' LightSource "ambientlight" \n')
586,591d585
< elif lamp.type == 'AREA':
< file.write(' Surface "constant"\n');
< if ob.parent:
< mat = ob.parent.matrix_world * ob.matrix_local
< else:
< mat = ob.matrix_world
593,601c587
< mat.transpose()
< file.write(' Transform %s\n' % rib(mat))
< mat.transpose()
< file.write(' Attribute "light" "string samplingstrategy" [ "%s" ]\n' % rm.samplingstrategy);
< file.write(' Attribute "light" "nsamples" [ %.0f ]\n' % rm.nsamples)
< file.write(' AreaLightSource "arealight" ')
< name, params = get_parameters_shaderinfo(passinfo.paths['shader'], 'arealight', 'light')
<
< file.write('"%s" \n' % ob.name) # handle
---
> file.write(' "%s" \n' % ob.name) # handle
635,637d620
< if lamp.type == 'AREA':
< file.write(' Scale -1 -1 -1\n')
< file.write(' Disk 0 0.5 360\n')
639c622
< file.write(' AttributeEnd\n\n')
---
> file.write(' AttributeEnd\n')
783c766
< mtx.transpose()
---
>
Common subdirectories: render_3delight/shaders and render_3delight_orig/shaders
diff render_3delight/ui.py render_3delight_orig/ui.py
876c876
< ('shadowspot', 'spotlight', 'pointlight', 'h_distantshadow', 'ambientlight','arealight')
---
> ('shadowspot', 'spotlight', 'pointlight', 'h_distantshadow', 'ambientlight')
925c925
< if lamp.type not in ('SPOT', 'SUN', 'POINT','AREA'): return False
---
> if lamp.type not in ('SPOT', 'SUN', 'POINT'): return False
936,964c936,940
< if not lamp.type == 'AREA':
< layout.prop(rm, "shadow_method", expand=True)
<
< if rm.shadow_method == 'SHADOW_MAP':
< layout.prop(rm, "shadow_map_generate_auto")
< col = layout.column()
< col.active = rm.shadow_map_generate_auto
< col.prop(rm, "shadow_transparent")
< col.prop(rm, "shadow_map_resolution")
< col.prop(rm, "shadingrate")
<
< if rm.shadow_transparent:
< row = col.row()
< row.prop(rm, "pixelsamples_x")
< row.prop(rm, "pixelsamples_y")
<
< if lamp.type == 'SPOT':
< split = col.split()
< col = split.column()
< col.prop(lamp, "shadow_buffer_clip_start", text="Clip Start")
< col = split.column()
< col.prop(lamp, "shadow_buffer_clip_end", text="Clip End")
< elif lamp.type == 'SUN':
< col.prop(rm, "ortho_scale")
< col.prop(lamp, "distance")
<
< elif rm.shadow_method == 'RAYTRACED':
< pass
< else:
---
>
> layout.prop(rm, "shadow_method", expand=True)
>
> if rm.shadow_method == 'SHADOW_MAP':
> layout.prop(rm, "shadow_map_generate_auto")
966,967c942,960
< col.prop(rm,"nsamples")
< col.prop(rm,"samplingstrategy")
---
> col.active = rm.shadow_map_generate_auto
> col.prop(rm, "shadow_transparent")
> col.prop(rm, "shadow_map_resolution")
> col.prop(rm, "shadingrate")
>
> if rm.shadow_transparent:
> row = col.row()
> row.prop(rm, "pixelsamples_x")
> row.prop(rm, "pixelsamples_y")
>
> if lamp.type == 'SPOT':
> split = col.split()
> col = split.column()
> col.prop(lamp, "shadow_buffer_clip_start", text="Clip Start")
> col = split.column()
> col.prop(lamp, "shadow_buffer_clip_end", text="Clip End")
> elif lamp.type == 'SUN':
> col.prop(rm, "ortho_scale")
> col.prop(lamp, "distance")
968a962,963
> elif rm.shadow_method == 'RAYTRACED':
> pass
  1. Common subdirectories: render_3delight/preview and render_3delight_orig/preview
  2. diff render_3delight/properties.py render_3delight_orig/properties.py
  3. 708,719d707
  4. <                
  5. <     nsamples = IntProperty(
  6. <                 name="nsamples",
  7. <                 description="Number of samples for AreaLight",
  8. <                 min=1,max=128,default=32)
  9. <                
  10. <     samplingstrategy = EnumProperty(
  11. <                 name="Sampling strategy",
  12. <                 description="How to sample the AreaLight",
  13. <                 items=[('lightsource','LightSource','Average Lightpoint, faster'),
  14. <                     ('illuminance','Illuminance','Illuminance, better, physical correct')],
  15. <                 default='lightsource')
  16. diff render_3delight/render.py render_3delight_orig/render.py
  17. 562c562
  18. <         file.write('    LightSource "%s" ' % rm.light_shaders.active)
  19. ---
  20. >         file.write('    LightSource "%s" \n' % rm.light_shaders.active)
  21. 567c567
  22. <         file.write('    LightSource "pointlight" ')
  23. ---
  24. >         file.write('    LightSource "pointlight" \n')
  25. 572c572
  26. <             file.write('    LightSource "shadowspot" ')
  27. ---
  28. >             file.write('    LightSource "shadowspot" \n')
  29. 576c576
  30. <             file.write('    LightSource "spotlight" ')
  31. ---
  32. >             file.write('    LightSource "spotlight" \n')
  33. 580c580
  34. <         file.write('    LightSource "h_distantshadow" ')
  35. ---
  36. >         file.write('    LightSource "h_distantshadow" \n')
  37. 584c584
  38. <         file.write('    LightSource "ambientlight" ')
  39. ---
  40. >         file.write('    LightSource "ambientlight" \n')
  41. 586,591d585
  42. <     elif lamp.type == 'AREA':
  43. <         file.write('        Surface "constant"\n');
  44. <         if ob.parent:
  45. <             mat = ob.parent.matrix_world * ob.matrix_local
  46. <         else:
  47. <             mat = ob.matrix_world
  48. 593,601c587
  49. <         mat.transpose()
  50. <         file.write('        Transform %s\n' % rib(mat))
  51. <         mat.transpose()
  52. <         file.write('        Attribute "light" "string samplingstrategy" [ "%s" ]\n' % rm.samplingstrategy);
  53. <         file.write('        Attribute "light" "nsamples" [ %.0f ]\n' % rm.nsamples)
  54. <         file.write('        AreaLightSource "arealight" ')
  55. <         name, params = get_parameters_shaderinfo(passinfo.paths['shader'], 'arealight', 'light')
  56. <    
  57. <     file.write('"%s" \n' % ob.name) # handle
  58. ---
  59. >     file.write('        "%s" \n' % ob.name) # handle
  60. 635,637d620
  61. <     if lamp.type == 'AREA':
  62. <          file.write('        Scale -1 -1 -1\n')
  63. <          file.write('        Disk 0 0.5 360\n')
  64. 639c622
  65. <     file.write('    AttributeEnd\n\n')
  66. ---
  67. >     file.write('    AttributeEnd\n')
  68. 783c766
  69. <             mtx.transpose()
  70. ---
  71. >        
  72. Common subdirectories: render_3delight/shaders and render_3delight_orig/shaders
  73. diff render_3delight/ui.py render_3delight_orig/ui.py
  74. 876c876
  75. <             ('shadowspot', 'spotlight', 'pointlight', 'h_distantshadow', 'ambientlight','arealight')
  76. ---
  77. >             ('shadowspot', 'spotlight', 'pointlight', 'h_distantshadow', 'ambientlight')
  78. 925c925
  79. <             if lamp.type not in ('SPOT', 'SUN', 'POINT','AREA'): return False
  80. ---
  81. >             if lamp.type not in ('SPOT', 'SUN', 'POINT'): return False
  82. 936,964c936,940
  83. <         if not lamp.type == 'AREA':
  84. <             layout.prop(rm, "shadow_method", expand=True)
  85. <        
  86. <             if rm.shadow_method == 'SHADOW_MAP':
  87. <                 layout.prop(rm, "shadow_map_generate_auto")
  88. <                 col = layout.column()
  89. <                 col.active = rm.shadow_map_generate_auto
  90. <                 col.prop(rm, "shadow_transparent")
  91. <                 col.prop(rm, "shadow_map_resolution")
  92. <                 col.prop(rm, "shadingrate")
  93. <                
  94. <                 if rm.shadow_transparent:
  95. <                     row = col.row()
  96. <                     row.prop(rm, "pixelsamples_x")
  97. <                     row.prop(rm, "pixelsamples_y")
  98. <                    
  99. <                 if lamp.type == 'SPOT':
  100. <                     split = col.split()
  101. <                     col = split.column()
  102. <                     col.prop(lamp, "shadow_buffer_clip_start", text="Clip Start")
  103. <                     col = split.column()
  104. <                     col.prop(lamp, "shadow_buffer_clip_end", text="Clip End")  
  105. <                 elif lamp.type == 'SUN':    
  106. <                     col.prop(rm, "ortho_scale")
  107. <                     col.prop(lamp, "distance")
  108. <                
  109. <             elif rm.shadow_method == 'RAYTRACED':
  110. <                 pass
  111. <         else:
  112. ---
  113. >
  114. >         layout.prop(rm, "shadow_method", expand=True)
  115. >
  116. >         if rm.shadow_method == 'SHADOW_MAP':
  117. >             layout.prop(rm, "shadow_map_generate_auto")
  118. 966,967c942,960
  119. <             col.prop(rm,"nsamples")
  120. <             col.prop(rm,"samplingstrategy")
  121. ---
  122. >             col.active = rm.shadow_map_generate_auto
  123. >             col.prop(rm, "shadow_transparent")
  124. >             col.prop(rm, "shadow_map_resolution")
  125. >             col.prop(rm, "shadingrate")
  126. >            
  127. >             if rm.shadow_transparent:
  128. >                 row = col.row()
  129. >                 row.prop(rm, "pixelsamples_x")
  130. >                 row.prop(rm, "pixelsamples_y")
  131. >                
  132. >             if lamp.type == 'SPOT':
  133. >                 split = col.split()
  134. >                 col = split.column()
  135. >                 col.prop(lamp, "shadow_buffer_clip_start", text="Clip Start")
  136. >                 col = split.column()
  137. >                 col.prop(lamp, "shadow_buffer_clip_end", text="Clip End")  
  138. >             elif lamp.type == 'SUN':    
  139. >                 col.prop(rm, "ortho_scale")
  140. >                 col.prop(lamp, "distance")
  141. 968a962,963
  142. >         elif rm.shadow_method == 'RAYTRACED':
  143. >             pass
  144.  
go to heaven