Cam simulator feature update (#15597)
* remove redundant code * Improve lighting, add ambient occlusion * Add cleanup code. Dialog is now deleted when cloesd. * change back to ambient occlusion * Fix G8x drill sequence bug. issue #14369 * fix bad simulation artifacts under Linux and QT. Issue #14369 * fix merge issue * fix border artifact on buttons * support showing path lines. revise the gui. * add option for arbitrary solids. wip * use vectors instead of mallocs * Handle arbitrary stock shapes + show base shape. * Complete the base shape display feature. eliminate co-planar artifacts. * support window scaling. upstream issue #14334 * Apply lint fixes * some missing lints. * Attend pylint issues * Apply code fixes based on @kadet1090 review * fix some clang-tidy warnings. * CAM: Linter cleanup round 1 --------- Co-authored-by: Chris Hennes <chennes@gmail.com>
This commit is contained in:
@@ -36,6 +36,9 @@ TextureItem texItems[] = {
|
||||
{70, 50, 0, 0},
|
||||
{27, 50, 0, 0},
|
||||
{44, 50, 0, 0},
|
||||
{90, 50, 0, 0},
|
||||
{128, 50, 0, 0},
|
||||
{168, 50, 0, 0},
|
||||
};
|
||||
|
||||
|
||||
@@ -51,7 +54,7 @@ TextureLoader::TextureLoader(std::string imgFolder, std::vector<std::string> fil
|
||||
if (mRawData == nullptr) {
|
||||
return;
|
||||
}
|
||||
memset(mRawData, 0x80, buffsize);
|
||||
memset(mRawData, 0x00, buffsize);
|
||||
for (std::size_t i = 0; i < fileNames.size(); i++) {
|
||||
QImage pixmap((imgFolder + fileNames[i]).c_str());
|
||||
AddImage(&(texItems[i]), pixmap, mRawData, textureSize);
|
||||
|
||||
Reference in New Issue
Block a user