qt3d/conflict_notes at 5.13.0 · dignakov/qt3d · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
qt3d.pro:
	ignored the extras from vr branch, and only added openvr to the end

qt3dquick3drenderplugin.cpp:
	merged with no manual changes


render.pro:
	adding:
		include (openvr/openvr.pri)
	ignoring:
		include (graphicshelpers/graphicshelpers.pri)

		also ignoring the mingw thing

handle_types_p.h:
	adding:

	ignoring:
		class QMatrix4x4; - assuming this is included in the new Qt3DCore stuff,
		may need to change QMatrix4v4 --> Matrix4x4
	changes:
		<OpenVRDevice, 16>HOpenVRDevice --> <OpenVRDevice> --- make sure this is correct

managers_p.h:
	changes:
		THIS WILL PROBABLY MEAN CHANGES TO OpenVRDeviceManager elsewhere !!!
		--> look at QResourceManager type . . .does it need an ArrayAllocationgPolicy?
		--> will have to look at the allocation policy, but I think that's handled internally now
		class OpenVRDeviceManager : public Qt3DCore::QResourceManager<
			OpenVRDevice,
			Qt3DCore::QNodeId,
			16, <----------------------------------- removed
			Qt3DCore::ArrayAllocatingPolicy> <------ removed
		{
		public:
		    OpenVRDeviceManager() {}
		};

nodemanagers.cpp:
	changes: added Q_DECL_NOTHROW to OpenVRDeviceManager

nodemanagers_p.h
	merged with no manual changes

framegraphnode_p.h:
	merged with no manual changes

qrenderasoect.cpp:
	merged with no manual changes

renderviewjobutils.cpp:
	merged with no manual changes
	there could be something under the OpenVRSubmit:{ case...


renderer.cpp:
	- keeping m_submissionContext(nullptr) --> it seemsm to have replaced m_graphicsContext
	- disregarding m_changeSet(0) --> this is now m_dirtyBits.marked
	- discarding m_shaderGatherJob <-- seems to be from an older version of this
	- disregarding m_calculateBoundingVolumeJob
	- disregard m_sendBufferCaptureJob

	- double check that the VR stuff does not use depricated parts

renderer_p.h:
	- keeping new "class SubmissionContext"
	- discarding m_shaderGatherJob...

to loook at for conf.:
openvrdevice.h
openvrdevice_p.h
openvrsubmitcommand.h
openvrsubmitcommand_p.h
qopenvrdevice.h
qopenvrsubmitcommand.h

HEADERS += \
    $$PWD/qopenvrdevice.h \
    $$PWD/openvrdevice_p.h \
    $$PWD/qopenvrsubmitcommand.h \
    $$PWD/openvrsubmitcommand_p.h

SOURCES += \
    $$PWD/qopenvrdevice.cpp \
    $$PWD/openvrdevice.cpp \
    $$PWD/qopenvrsubmitcommand.cpp \
    $$PWD/openvrsubmitcommand.cpp