[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23225] trunk/blender/source/blender/ editors/space_view3d: Smoke:

[Daniel Genrich]

Revision: 23225
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23225
Author:   genscher
Date:     2009-09-14 18:43:13 +0200 (Mon, 14 Sep 2009)

Log Message:
-----------
Smoke:
* Introduce a better check for fragment support

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/editors/space_view3d/drawvolume.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2009-09-14 16:30:53 UTC (rev 23224)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2009-09-14 16:43:13 UTC (rev 23225)
@@ -5360,7 +5360,7 @@
                {
                        if(!smd->domain->wt || !(smd->domain->viewsettings & 
MOD_SMOKE_VIEW_SHOWBIG))
                        {
-// #if0
+// #if 0
                                smd->domain->tex = NULL;
                                GPU_create_smoke(smd, 0);
                                draw_volume(scene, ar, v3d, base, 
smd->domain->tex, smd->domain->p0, smd->domain->p1, smd->domain->res, 
smd->domain->dx, smd->domain->tex_shadow);
@@ -5395,7 +5395,7 @@
                                                tmp[0] += smd->domain->dx * x + 
smd->domain->dx * 0.5;
                                                tmp[1] += smd->domain->dx * y + 
smd->domain->dx * 0.5;
                                                tmp[2] += smd->domain->dx * z + 
smd->domain->dx * 0.5;
-                                               color[0] = color[1] = color[2] 
= 1.0; // density[index];
+                                               color[0] = color[1] = color[2] 
= density[index];
                                                glColor3fv(color);
                                                bglVertex3fv(tmp);
                                        }

Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c      
2009-09-14 16:30:53 UTC (rev 23224)
+++ trunk/blender/source/blender/editors/space_view3d/drawvolume.c      
2009-09-14 16:43:13 UTC (rev 23225)
@@ -328,10 +328,10 @@
 
        // printf("i: %d\n", i);
 
-       if(GLEW_ARB_fragment_program)
+        if (GL_TRUE == glewIsSupported("GL_ARB_fragment_program"))
        {
+               glEnable(GL_FRAGMENT_PROGRAM_ARB);
                glGenProgramsARB(1, &prog);
-               glEnable(GL_FRAGMENT_PROGRAM_ARB);
 
                glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, prog);
                glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, 
GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(text), text);
@@ -342,7 +342,7 @@
                glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, 1, 7.0, 
7.0, 7.0, 1.0);
        }
        else
-               printf("Your gfx card does not support 3dview smoke drawing.");
+               printf("Your gfx card does not support 3dview smoke 
drawing.\n");
 
        GPU_texture_bind(tex, 0);
        if(tex_shadow)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs