Skip to content

Commit

Permalink
Merge pull request #525 from gforney/master
Browse files Browse the repository at this point in the history 
smokeview source: corrections to logic coloring boundary file data wh…
  • Loading branch information
@gforney
gforney authored Feb 7, 2018
2 parents aa1012f + 63eb357 commit 9d5f2f1
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions Source/smokeview/IOboundary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ void ReadBoundaryBndf(int ifile, int flag, int *errorcode){
one time step at a time rather than for all time steps.
*/

if(statfile==0&&setpatchmin==1&&setpatchmax==1&&cache_boundarydata==0)loadpatchbysteps=UNCOMPRESSED_BYFRAME;
if(statfile==0&&(setpatchmin==1||setpatchmax==1)&&cache_boundarydata==0)loadpatchbysteps=UNCOMPRESSED_BYFRAME;
}
}
else{
Expand Down Expand Up @@ -2587,10 +2587,10 @@ void DrawBoundaryTexture(const meshdata *meshi){

for(icol=0;icol<ncol-1;icol++){
if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
r11 = (float)(*cpatchval1)/255.0;
r12 = (float)(*(cpatchval1+1))/255.0;
r21 = (float)(*cpatchval2)/255.0;
r22 = (float)(*(cpatchval2+1))/255.0;
r11 = (float)((unsigned char)(*cpatchval1))/255.0;
r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
r21 = (float)((unsigned char)(*cpatchval2))/255.0;
r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
if(ABS(r11-r22)<ABS(r12-r21)){
glTexCoord1f(r11);glVertex3fv(xyzp1);
glTexCoord1f(r12);glVertex3fv(xyzp1+3);
Expand Down Expand Up @@ -2680,10 +2680,10 @@ void DrawBoundaryTexture(const meshdata *meshi){

for(icol=0;icol<ncol-1;icol++){
if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
r11 = (float)(*cpatchval1)/255.0;
r12 = (float)(*(cpatchval1+1))/255.0;
r21 = (float)(*cpatchval2)/255.0;
r22 = (float)(*(cpatchval2+1))/255.0;
r11 = (float)((unsigned char)(*cpatchval1))/255.0;
r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
r21 = (float)((unsigned char)(*cpatchval2))/255.0;
r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
if(ABS(*cpatchval1-*(cpatchval2+1))<ABS(*(cpatchval1+1)-*cpatchval2)){
glTexCoord1f(r11);glVertex3fv(xyzp1);
glTexCoord1f(r12);glVertex3fv(xyzp1+3);
Expand Down Expand Up @@ -2770,10 +2770,10 @@ void DrawBoundaryTexture(const meshdata *meshi){

for(icol=0;icol<ncol-1;icol++){
if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
r11 = (float)(*cpatchval1)/255.0;
r12 = (float)(*(cpatchval1+1))/255.0;
r21 = (float)(*cpatchval2)/255.0;
r22 = (float)(*(cpatchval2+1))/255.0;
r11 = (float)((unsigned char)(*cpatchval1))/255.0;
r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
r21 = (float)((unsigned char)(*cpatchval2))/255.0;
r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
if(ABS(*cpatchval1-*(cpatchval2+1))<ABS(*(cpatchval1+1)-*cpatchval2)){
glTexCoord1f(r11);glVertex3fv(xyzp1);
glTexCoord1f(r22);glVertex3fv(xyzp2+3);
Expand Down Expand Up @@ -2903,10 +2903,10 @@ void DrawBoundaryTextureThreshold(const meshdata *meshi){

for(icol=0;icol<ncol-1;icol++){
if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
r11 = (float)(*cpatchval1)/255.0;
r12 = (float)(*(cpatchval1+1))/255.0;
r21 = (float)(*cpatchval2)/255.0;
r22 = (float)(*(cpatchval2+1))/255.0;
r11 = (float)((unsigned char)(*cpatchval1))/255.0;
r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
r21 = (float)((unsigned char)(*cpatchval2))/255.0;
r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
color11=clear_color;
color12=clear_color;
color21=clear_color;
Expand Down Expand Up @@ -2990,10 +2990,10 @@ void DrawBoundaryTextureThreshold(const meshdata *meshi){

for(icol=0;icol<ncol-1;icol++){
if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
r11 = (float)(*cpatchval1)/255.0;
r12 = (float)(*(cpatchval1+1))/255.0;
r21 = (float)(*cpatchval2)/255.0;
r22 = (float)(*(cpatchval2+1))/255.0;
r11 = (float)((unsigned char)(*cpatchval1))/255.0;
r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
r21 = (float)((unsigned char)(*cpatchval2))/255.0;
r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
color11=clear_color;
color12=clear_color;
color21=clear_color;
Expand Down Expand Up @@ -3073,10 +3073,10 @@ void DrawBoundaryTextureThreshold(const meshdata *meshi){

for(icol=0;icol<ncol-1;icol++){
if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
r11 = (float)(*cpatchval1)/255.0;
r12 = (float)(*(cpatchval1+1))/255.0;
r21 = (float)(*cpatchval2)/255.0;
r22 = (float)(*(cpatchval2+1))/255.0;
r11 = (float)((unsigned char)(*cpatchval1))/255.0;
r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
r21 = (float)((unsigned char)(*cpatchval2))/255.0;
r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
color11=clear_color;
color12=clear_color;
color21=clear_color;
Expand Down

0 comments on commit 9d5f2f1

Please sign in to comment.