Skip to content

smokeview source: correction to circular vent offset #2549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gforney merged 12 commits into from
Feb 27, 2026
Merged

smokeview source: correction to circular vent offset #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d6a2e97
smokeview source: correction to circular vent offset
gforney Feb 27, 2026
02fea1f
smokeview source: remove unused variables from draw circular vent rou…
gforney Feb 27, 2026
87473a5
smokeview source: correction to previous commit
gforney Feb 27, 2026
3288c68
smokeview source: remove unused variables
gforney Feb 27, 2026
0d89258
workflow: update line 118 to updload a more recent vcpkg
gforney Feb 27, 2026
eaa12c5
Merge remote-tracking branch 'origin/voffset' into voffset
gforney Feb 27, 2026
6e7552e
dummy commit - test github workflow
gforney Feb 27, 2026
8ce692f
get latest version of vcpkg
gforney Feb 27, 2026
14d5b05
Revert "workflow: update line 118 to updload a more recent vcpkg"
gforney Feb 27, 2026
6052604
Merge pull request #16 from gforney/prtest
gforney Feb 27, 2026
5a36895
Merge branch 'prtest' into voffset
gforney Feb 27, 2026
0099328
Merge remote-tracking branch 'origin/master' into voffset
gforney Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,13 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Pin vcpkg version
run: |
- name: Pin vcpkg version
run: |
cd C:\vcpkg
git fetch
git checkout 5c6220035e9de2741e9f55571d63e4f97839b36e
git pull
git checkout master
.\\bootstrap-vcpkg.bat
- name: build smokeview
shell: cmd
Expand Down
2 changes: 1 addition & 1 deletion Source/smokebot_trigger.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
master: dummy text to trigger smokebot
master: dummy text to trigger smokebot
test: dummy text to trigger smokebot
81 changes: 59 additions & 22 deletions Source/smokeview/drawGeometry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@ void DrawCircVentsApproxSolid(int option){
int j;
meshdata *meshi;
float *xplt, *yplt, *zplt;
float dx, dy, dz, dxyz;
float dx, dxyz;

meshi = global_scase.meshescoll.meshinfo + i;
xplt = meshi->xplt_smv;
yplt = meshi->yplt_smv;
zplt = meshi->zplt_smv;
dx = xplt[1] - xplt[0];
dy = yplt[1] - yplt[0];
dz = zplt[1] - zplt[0];
dxyz = MIN(MIN(dx, dy), dz)/10.0;
dxyz = SCALE2SMV(xyzmaxdiff/400.0);

for(j=0;j<meshi->ncvents;j++){
cventdata *cvi;
Expand Down Expand Up @@ -185,17 +182,14 @@ void DrawCircVentsApproxOutline(int option){
int j;
meshdata *meshi;
float *xplt, *yplt, *zplt;
float dx, dy, dz, dxyz;
float dx, dxyz;

meshi = global_scase.meshescoll.meshinfo + i;
xplt = meshi->xplt_smv;
yplt = meshi->yplt_smv;
zplt = meshi->zplt_smv;

dx = xplt[1] - xplt[0];
dy = yplt[1] - yplt[0];
dz = zplt[1] - zplt[0];
dxyz = MIN(MIN(dx, dy), dz)/10.0;
dxyz = SCALE2SMV(xyzmaxdiff/400.0);

for(j=0;j<meshi->ncvents;j++){
cventdata *cvi;
Expand Down Expand Up @@ -374,7 +368,6 @@ void DrawCircVentsExactSolid(int option){
cventdata *cvi;
float x0, yy0, z0;
unsigned char vcolor[3];
float delta;
float *color;
float width, height;

Expand All @@ -396,14 +389,40 @@ void DrawCircVentsExactSolid(int option){
z0 = cvi->zmin;
}

delta=0.001;
float delta, deltax = 0.0, deltay = 0.0, deltaz = 0.0;

delta = xyzmaxdiff / 400.0;
switch(cvi->dir){
case DOWN_X:
deltax = -delta;
break;
case UP_X:
deltax = delta;
break;
case DOWN_Y:
deltay = -delta;
break;
case UP_Y:
deltay = delta;
break;
case DOWN_Z:
deltaz = -delta;
break;
case UP_Z:
deltaz = delta;
break;
default:
assert(0);
break;
}
color=cvi->color;
vcolor[0]=color[0]*255;
vcolor[1]=color[1]*255;
vcolor[2]=color[2]*255;
glPushMatrix();
glScalef(SCALE2SMV(1.0),SCALE2SMV(1.0),SCALE2SMV(1.0));
glTranslatef(-global_scase.xbar0,-global_scase.ybar0,-global_scase.zbar0);
glTranslatef(-global_scase.xbar0+deltax,
-global_scase.ybar0+deltay,-global_scase.zbar0+deltaz);
if(option==VENT_CIRCLE){
clipdata circleclip;
float *ventmin, *ventmax;
Expand All @@ -420,36 +439,30 @@ void DrawCircVentsExactSolid(int option){
height = 0.0;
switch(cvi->dir){
case DOWN_X:
glTranslatef(-delta,0.0,0.0);
glRotatef(-90.0,0.0,1.0,0.0);
width += cvi->ymax-cvi->ymin;
height += cvi->zmax-cvi->zmin;
break;
case UP_X:
glTranslatef(delta,0.0,0.0);
glRotatef(-90.0,0.0,1.0,0.0);
width += cvi->ymax-cvi->ymin;
height += cvi->zmax-cvi->zmin;
break;
case DOWN_Y:
glTranslatef(0.0,-delta,0.0);
glRotatef(90.0,1.0,0.0,0.0);
width += cvi->xmax-cvi->xmin;
height += cvi->zmax-cvi->zmin;
break;
case UP_Y:
glTranslatef(0.0,delta,0.0);
glRotatef(90.0,1.0,0.0,0.0);
width += cvi->xmax-cvi->xmin;
height += cvi->zmax-cvi->zmin;
break;
case DOWN_Z:
glTranslatef(0.0,0.0,-delta);
width += cvi->xmax-cvi->xmin;
height += cvi->ymax-cvi->ymin;
break;
case UP_Z:
glTranslatef(0.0,0.0,delta);
width += cvi->xmax-cvi->xmin;
height += cvi->ymax-cvi->ymin;
break;
Expand Down Expand Up @@ -487,7 +500,6 @@ void DrawCircVentsExactOutline(int option){
cventdata *cvi;
float x0, yy0, z0;
unsigned char vcolor[3];
float delta;
float *color;
float width, height;

Expand All @@ -509,14 +521,39 @@ void DrawCircVentsExactOutline(int option){
z0 = cvi->zmin;
}

delta=0.001;
float delta, deltax = 0.0, deltay = 0.0, deltaz = 0.0;

delta = xyzmaxdiff / 400.0;
switch(cvi->dir){
case DOWN_X:
deltax = -delta;
break;
case UP_X:
deltax = delta;
break;
case DOWN_Y:
deltay = -delta;
break;
case UP_Y:
deltay = delta;
break;
case DOWN_Z:
deltaz = -delta;
break;
case UP_Z:
deltaz = delta;
break;
default:
assert(0);
break;
}
color=cvi->color;
vcolor[0]=color[0]*255;
vcolor[1]=color[1]*255;
vcolor[2]=color[2]*255;
glPushMatrix();
glScalef(SCALE2SMV(1.0),SCALE2SMV(1.0),SCALE2SMV(1.0));
glTranslatef(-global_scase.xbar0,-global_scase.ybar0,-global_scase.zbar0);
glTranslatef(-global_scase.xbar0+deltax,-global_scase.ybar0+deltay,-global_scase.zbar0+deltaz);
if(option==VENT_CIRCLE){
clipdata circleclip;
float *ventmin, *ventmax;
Expand Down