Skip to content

Commit d35b97d

Browse files
committed
rework dir structure
1 parent 55648cf commit d35b97d

File tree

156 files changed

+128
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+128
-118
lines changed

src/1.6.1.textures/resources.qrc

-8
This file was deleted.

src/1.7.transform/resources.qrc

-8
This file was deleted.

src/1.8.0.square/resources.qrc

-8
This file was deleted.

src/1.8.1.cube/resources.qrc

-8
This file was deleted.

src/1.8.2.cubes/resources.qrc

-8
This file was deleted.

src/1.9.camera/resources.qrc

-8
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Project {
2+
references: [
3+
"1.window/window.qbs",
4+
"2.1.triangle/triangle.qbs",
5+
"2.2.rect/rect.qbs",
6+
"3.shaders/shaders.qbs",
7+
"4.1.texture/texture.qbs",
8+
"4.2.textures/textures.qbs",
9+
"5.transform/transform.qbs",
10+
"6.1.square/square.qbs",
11+
"6.2.cube/cube.qbs",
12+
"6.3.cubes/cubes.qbs",
13+
"7.camera/camera.qbs",
14+
]
15+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/1.6.0.texture/resources.qrc renamed to src/1.getting_started/4.1.texture/resources.qrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file alias="container.jpg">../../resources/textures/container.jpg</file>
3+
<file alias="container.jpg">../../../resources/textures/container.jpg</file>
44
<file>fshader.glsl</file>
55
<file>vshader.glsl</file>
66
</qresource>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="container.jpg">../../../resources/textures/container.jpg</file>
4+
<file alias="awesomeface.png">../../../resources/textures/awesomeface.png</file>
5+
<file>fshader.glsl</file>
6+
<file>vshader.glsl</file>
7+
</qresource>
8+
</RCC>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="container.jpg">../../../resources/textures/container.jpg</file>
4+
<file alias="awesomeface.png">../../../resources/textures/awesomeface.png</file>
5+
<file>fshader.glsl</file>
6+
<file>vshader.glsl</file>
7+
</qresource>
8+
</RCC>
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="container.jpg">../../../resources/textures/container.jpg</file>
4+
<file alias="awesomeface.png">../../../resources/textures/awesomeface.png</file>
5+
<file>fshader.glsl</file>
6+
<file>vshader.glsl</file>
7+
</qresource>
8+
</RCC>
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="container.jpg">../../../resources/textures/container.jpg</file>
4+
<file alias="awesomeface.png">../../../resources/textures/awesomeface.png</file>
5+
<file>fshader.glsl</file>
6+
<file>vshader.glsl</file>
7+
</qresource>
8+
</RCC>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="container.jpg">../../../resources/textures/container.jpg</file>
4+
<file alias="awesomeface.png">../../../resources/textures/awesomeface.png</file>
5+
<file>fshader.glsl</file>
6+
<file>vshader.glsl</file>
7+
</qresource>
8+
</RCC>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="container.jpg">../../../resources/textures/container.jpg</file>
4+
<file alias="awesomeface.png">../../../resources/textures/awesomeface.png</file>
5+
<file>fshader.glsl</file>
6+
<file>vshader.glsl</file>
7+
</qresource>
8+
</RCC>
File renamed without changes.
File renamed without changes.

src/2.4.texturemap/resources.qrc

-10
This file was deleted.

src/2.5.0.direct_light/resources.qrc

-10
This file was deleted.

src/2.5.1.point_light/resources.qrc

-10
This file was deleted.

src/2.5.2.spot_light/resources.qrc

-10
This file was deleted.

src/2.6.lights/resources.qrc

-10
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/2.lighting/2.lighting.qbs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Project {
2+
references: [
3+
"1.color/color.qbs",
4+
"2.light/light.qbs",
5+
"3.material/material.qbs",
6+
"4.texturemap/texturemap.qbs",
7+
"5.1.direct_light/direct_light.qbs",
8+
"5.2.point_light/point_light.qbs",
9+
"5.3.spot_light/spot_light.qbs",
10+
"6.multiple_lights/multiple_lights.qbs",
11+
]
12+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>fshader.glsl</file>
4+
<file>vshader.glsl</file>
5+
<file>flamp.glsl</file>
6+
<file>vlamp.glsl</file>
7+
<file alias="container2.png">../../../resources/textures/container2.png</file>
8+
<file alias="container2_specular.png">../../../resources/textures/container2_specular.png</file>
9+
</qresource>
10+
</RCC>
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>fshader.glsl</file>
4+
<file>vshader.glsl</file>
5+
<file>flamp.glsl</file>
6+
<file>vlamp.glsl</file>
7+
<file alias="container2.png">../../../resources/textures/container2.png</file>
8+
<file alias="container2_specular.png">../../../resources/textures/container2_specular.png</file>
9+
</qresource>
10+
</RCC>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>fshader.glsl</file>
4+
<file>vshader.glsl</file>
5+
<file>flamp.glsl</file>
6+
<file>vlamp.glsl</file>
7+
<file alias="container2.png">../../../resources/textures/container2.png</file>
8+
<file alias="container2_specular.png">../../../resources/textures/container2_specular.png</file>
9+
</qresource>
10+
</RCC>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>fshader.glsl</file>
4+
<file>vshader.glsl</file>
5+
<file>flamp.glsl</file>
6+
<file>vlamp.glsl</file>
7+
<file alias="container2.png">../../../resources/textures/container2.png</file>
8+
<file alias="container2_specular.png">../../../resources/textures/container2_specular.png</file>
9+
</qresource>
10+
</RCC>
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>fshader.glsl</file>
4+
<file>vshader.glsl</file>
5+
<file>flamp.glsl</file>
6+
<file>vlamp.glsl</file>
7+
<file alias="container2.png">../../../resources/textures/container2.png</file>
8+
<file alias="container2_specular.png">../../../resources/textures/container2_specular.png</file>
9+
</qresource>
10+
</RCC>
File renamed without changes.

src/src.qbs

+2-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,6 @@
11
Project {
22
references: [
3-
"1.3.window/window.qbs",
4-
"1.4.0.triangle/triangle.qbs",
5-
"1.4.1.rect/rect.qbs",
6-
"1.5.shaders/shaders.qbs",
7-
"1.6.0.texture/texture.qbs",
8-
"1.6.1.textures/textures.qbs",
9-
"1.7.transform/transform.qbs",
10-
"1.8.0.square/square.qbs",
11-
"1.8.1.cube/cube.qbs",
12-
"1.8.2.cubes/cubes.qbs",
13-
"1.9.camera/camera.qbs",
14-
"2.1.color/color.qbs",
15-
"2.2.light/light.qbs",
16-
"2.3.material/material.qbs",
17-
"2.4.texturemap/texturemap.qbs",
18-
"2.5.0.direct_light/direct_light.qbs",
19-
"2.5.1.point_light/point_light.qbs",
20-
"2.5.2.spot_light/spot_light.qbs",
21-
"2.6.lights/lights.qbs",
3+
"1.getting_started/1.getting_started.qbs",
4+
"2.lighting/2.lighting.qbs",
225
]
236
}

0 commit comments

Comments
 (0)