|
@@ -799,7 +799,7 @@ int laGetReadyWith(laInitArguments* ia){
|
|
|
wt.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
|
|
|
if (!RegisterClassExW(&wt)) return 0;
|
|
|
|
|
|
- MAIN.GLMajor=MAIN.GLMajor<0?GLMajor:3; MAIN.GLMinor=MAIN.GLMinor<0?GLMinor:3; MAIN.BufferSamples=BufferSamples;
|
|
|
+ MAIN.GLMajor=MAIN.InitArgs.GLMajor; MAIN.GLMinor=MAIN.InitArgs.GLMinor; MAIN.BufferSamples=MAIN.InitArgs.BufferSamples;
|
|
|
logPrint("Chosen OpenGL version %d.%d\n", MAIN.GLMajor, MAIN.GLMinor);
|
|
|
|
|
|
SetProcessDPIAware();
|
|
@@ -6760,7 +6760,10 @@ LRESULT CALLBACK LA_WindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
|
|
|
MAIN.StylusPressure = (real)pkt.pkNormalPressure/MAIN.WinTabMaxPenPressure;
|
|
|
real angle = (real)pkt.pkOrientation.orAzimuth / 3600*TNS_PI*2+TNS_PI/2;
|
|
|
MAIN.StylusOrientation = angle; MAIN.StylusDeviation=rad((90.0f-(real)pkt.pkOrientation.orAltitude/10.0f));
|
|
|
- //printf("%f %f\n",angle,MAIN.StylusDeviation);
|
|
|
+ real tw=(real)pkt.pkOrientation.orTwist; tw=rad(tw/10);
|
|
|
+ MAIN.StylusTwist = tw;
|
|
|
+ MAIN.EraserDeviation=MAIN.StylusDeviation;MAIN.EraserOrientation=MAIN.StylusOrientation;
|
|
|
+ MAIN.EraserPressure=MAIN.StylusPressure;
|
|
|
MAIN.IsPen = 1; MAIN.PointerIsEraser=((pkt.pkStatus & TPS_INVERT)==TPS_INVERT);
|
|
|
}
|
|
|
break;
|