Skip to content

Commit 75f1fb8

Browse files
committed
New C3D, Vision 2.6.4.6
1 parent 2427fca commit 75f1fb8

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

QtCellLifeSimulationApp/C3D_USAGE.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33
// Define actual licence key and licence signature
44

55
//#define C3D_USAGE
6-
#define LKEY "qwerty.12345.[WIN][cnv][mdl][slv][vsn][bsh]"
7-
#define LSIGN "asdfghjkl=="
86

QtCellLifeSimulationApp/SimulationViewC3D.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ static inline Image ConvertToImage(QImage image)
1616
return result;
1717
}
1818

19-
static void createShapeSegment(GeometryRep* pShapeRep, const MbVector3D& vecMove, const Color& color, SceneSegment* pParent)
19+
static NodeKey createShapeSegment(GeometryRep* pShapeRep, const MbVector3D& vecMove, const Color& color, SceneSegment* pParent)
2020
{
2121
SceneSegment* pSegment = new SceneSegment(pShapeRep, pParent);
2222
pSegment->SetColorPresentationMaterial(color);
23-
MbMatrix3D relativeMatrix; relativeMatrix.Move(vecMove);
24-
pSegment->CreateRelativeMatrix(relativeMatrix);
23+
pSegment->GetTransform().Move(vecMove);
24+
return pSegment->GetUniqueKey();
2525
}
2626

2727
SimulationViewC3D::SimulationViewC3D(QWidget* parent)
@@ -30,6 +30,7 @@ SimulationViewC3D::SimulationViewC3D(QWidget* parent)
3030
QtVision::setSurfaceFormat();
3131
glWidget = new QtVision::QtOpenGLSceneWidget(this);
3232
setCentralWidget(glWidget);
33+
QtVision::createProcessesCameraControls(glWidget);
3334
prepareScene();
3435
checkLicense();
3536
}
@@ -51,12 +52,8 @@ void SimulationViewC3D::clear()
5152

5253
void SimulationViewC3D::resize3DScene()
5354
{
54-
SceneSegment* pTopSegment = glWidget->sceneContent()->GetRootSegment();
55-
Q_ASSERT(pTopSegment != nullptr);
5655
glWidget->sceneContent()->GetContainer()->SetUseVertexBufferObjects(true);
57-
QtVision::createProcessesCameraControls(glWidget->graphicsEngine()->GetTopEssence());
58-
glWidget->viewport()->ZoomToFit(glWidget->sceneContent()->GetBoundingBox());
59-
QRect geom = QApplication::desktop()->availableGeometry();
56+
glWidget->ZoomToFit();
6057
}
6158

6259
void SimulationViewC3D::frameComplete()
@@ -114,17 +111,14 @@ void SimulationViewC3D::prepareScene()
114111
::createShapeSegment(SceneGenerator::Instance()->CreateBox(2.5, 2.5, 2.5), MbVector3D(5.0, -4.0, 0.0), Color(0, 0, 180), pTopSegment);
115112

116113
glWidget->sceneContent()->GetContainer()->SetUseVertexBufferObjects(true);
117-
QtVision::createProcessesCameraControls(glWidget->graphicsEngine()->GetTopEssence());
118114
glWidget->viewport()->ZoomToFit(glWidget->sceneContent()->GetBoundingBox());
119115

120116
glWidget->move(QPoint(200, 200));
121-
QRect geom = QApplication::desktop()->availableGeometry();
122117
}
123118

124119
void SimulationViewC3D::checkLicense()
125120
{
126-
QtVision::setLicenseKeyValues(LKEY, LSIGN);
127-
QtVision::checkLicenseWithInput();
121+
QtVision::activateLicense();
128122
}
129123

130124
#endif

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ There are five projects here :
1212
- WPF C# client
1313
- Web C# ASP.NET / Angular client
1414

15-
This project depends from C3D Toolkit!
15+
At first, need to set up your VS for working with Qt to build this project.
1616

17-
If you have it, you need to:
17+
This project depends from C3D Toolkit! You can launch it without C3D, but, if you have it, you need to:
1818

19-
- Copy folder "QtVision" with QtVision static libray built from [this](https://github.com/maxchistt/QtVision-Static-Class-Library) (tag v1.1) project into solution folder
19+
- Copy folder "QtVision" with QtVision static libray, built from [this](https://github.com/maxchistt/QtVision-Static-Class-Library) project by running "QtVision.Export.ps1", into solution folder
2020
- Copy "Kernel" and "Vision" distribution folders into solution folder into "C3D" subfolder
21-
- Define actual licence key and licence signature in "C3D_USAGE.h" file in "QtCellLifeSimulationApp" project
2221
- Uncomment "`#define C3D_USAGE`" in "C3D_USAGE.h" file in "QtCellLifeSimulationApp" project
23-
- Add "c3dvision.lib;c3d.lib;qtvision.lib;" to additional dependencies of "QtCellLifeSimulationApp" project in project settings
22+
- Add "c3dvision.lib;c3d.lib;QtVision.lib;" to additional dependencies of "QtCellLifeSimulationApp" project in project settings
2423

2524
![WPF](https://i.postimg.cc/YCcTkCyb/image.png)
2625

0 commit comments

Comments
 (0)