ir/justhomework
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(OpenGL): mv hello to lab3

Browse source
This commit is contained in:
iridiumR 2023-06-18 15:57:59 +08:00
parent 2db9fb0cae
commit a54a1af473
71 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AIandML/e1_python_basics/e1.0_python.ipynb
View file

@ -10,7 +10,7 @@
"\n",
"|学号 |姓名 |\n",
"|----------|--------|\n",
"|***REMOVED***|***REMOVED***|\n",
"|2020114490|江一和|\n",
"|2020113874|何一涛|"
]
},

2
AIandML/e1_python_basics/e1.1_numpy.ipynb
View file

@ -10,7 +10,7 @@
"\n",
"|学号 |姓名 |\n",
"|----------|--------|\n",
"|***REMOVED***|***REMOVED***|\n",
"|2020114490|江一和|\n",
"|2020113874|何一涛|"
]
},

2
AIandML/e1_python_basics/e1.2_matplotlib.ipynb
View file

@ -15,7 +15,7 @@
"\n",
"|学号 |姓名 |\n",
"|----------|--------|\n",
"|***REMOVED***|***REMOVED***|\n",
"|2020114490|江一和|\n",
"|2020113874|何一涛|"
]
},

2
AIandML/e1_python_basics/e1.3_pandas.ipynb
View file

@ -9,7 +9,7 @@
"\n",
"|学号 |姓名 |\n",
"|----------|--------|\n",
"|***REMOVED***|***REMOVED***|\n",
"|2020114490|江一和|\n",
"|2020113874|何一涛|\n",
"\n",
"本部分的实验，需要自己在网络学习相关基础函数使用。"

BIN
CN/IP1.pcapng Normal file
View file

Binary file not shown.

0
OpenGL/hello/Makefile → OpenGL/lab3/Makefile
View file

0
OpenGL/hello/include/KHR/khrplatform.h → OpenGL/lab3/include/KHR/khrplatform.h
View file

0
OpenGL/hello/include/camera.h → OpenGL/lab3/include/camera.h
View file

0
OpenGL/hello/include/glad/glad.h → OpenGL/lab3/include/glad/glad.h
View file

0
OpenGL/hello/include/mesh.h → OpenGL/lab3/include/mesh.h
View file

0
OpenGL/hello/include/model.h → OpenGL/lab3/include/model.h
View file

0
OpenGL/hello/include/shader.h → OpenGL/lab3/include/shader.h
View file

0
OpenGL/hello/include/source.h → OpenGL/lab3/include/source.h
View file

0
OpenGL/hello/include/stb_image.h → OpenGL/lab3/include/stb_image.h
View file

0
OpenGL/hello/resources/awesomeface.png → OpenGL/lab3/resources/awesomeface.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
OpenGL/hello/resources/container.jpg → OpenGL/lab3/resources/container.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 181 KiB

0
OpenGL/hello/resources/models/clock/BGE_Clock.blend → OpenGL/lab3/resources/models/clock/BGE_Clock.blend
View file

0
OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (1).jpg → OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (1).jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (2).jpg → OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (2).jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

0
OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (3).jpg → OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (3).jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (4).jpg → OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (4).jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (5).jpg → OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (5).jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (6).jpg → OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (6).jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
OpenGL/hello/resources/models/clock/Clock_3ds.3ds → OpenGL/lab3/resources/models/clock/Clock_3ds.3ds
View file

0
OpenGL/hello/resources/models/clock/Clock_dae.dae → OpenGL/lab3/resources/models/clock/Clock_dae.dae
View file

0
OpenGL/hello/resources/models/clock/Clock_fbx.fbx → OpenGL/lab3/resources/models/clock/Clock_fbx.fbx
View file

0
OpenGL/hello/resources/models/clock/Clock_for_CYCLES.blend → OpenGL/lab3/resources/models/clock/Clock_for_CYCLES.blend
View file

0
OpenGL/hello/resources/models/clock/Clock_obj.mtl → OpenGL/lab3/resources/models/clock/Clock_obj.mtl
View file

0
OpenGL/hello/resources/models/clock/Clock_obj.obj → OpenGL/lab3/resources/models/clock/Clock_obj.obj
View file

0
OpenGL/hello/resources/models/clock/Clock_x3d.x3d → OpenGL/lab3/resources/models/clock/Clock_x3d.x3d
View file

0
OpenGL/hello/resources/models/clock/Constrain_Clock.blend → OpenGL/lab3/resources/models/clock/Constrain_Clock.blend
View file

0
OpenGL/hello/resources/models/clock/Constrain_Clock.blend1 → OpenGL/lab3/resources/models/clock/Constrain_Clock.blend1
View file

0
OpenGL/hello/resources/models/clock/Readme.txt → OpenGL/lab3/resources/models/clock/Readme.txt
View file

0
OpenGL/hello/resources/models/clock/textures/Black.jpg → OpenGL/lab3/resources/models/clock/textures/Black.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

0
OpenGL/hello/resources/models/clock/textures/Black_nor.jpg → OpenGL/lab3/resources/models/clock/textures/Black_nor.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 389 KiB

After

Width:  |  Height:  |  Size: 389 KiB

0
OpenGL/hello/resources/models/clock/textures/Ref.jpg → OpenGL/lab3/resources/models/clock/textures/Ref.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

0
OpenGL/hello/resources/models/clock/textures/Uhr_ohne_Zeiger.jpg → OpenGL/lab3/resources/models/clock/textures/Uhr_ohne_Zeiger.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

0
OpenGL/hello/resources/models/clock/textures/steel.jpg → OpenGL/lab3/resources/models/clock/textures/steel.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 258 KiB

0
OpenGL/hello/resources/models/clock/textures/steel_nor.jpg → OpenGL/lab3/resources/models/clock/textures/steel_nor.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 KiB

After

Width:  |  Height:  |  Size: 278 KiB

0
OpenGL/hello/resources/models/nanosuit/LICENSE.txt → OpenGL/lab3/resources/models/nanosuit/LICENSE.txt
View file

0
OpenGL/hello/resources/models/nanosuit/arm_dif.png → OpenGL/lab3/resources/models/nanosuit/arm_dif.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 KiB

After

Width:  |  Height:  |  Size: 562 KiB

0
OpenGL/hello/resources/models/nanosuit/arm_showroom_ddn.png → OpenGL/lab3/resources/models/nanosuit/arm_showroom_ddn.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 846 KiB

After

Width:  |  Height:  |  Size: 846 KiB

0
OpenGL/hello/resources/models/nanosuit/arm_showroom_spec.png → OpenGL/lab3/resources/models/nanosuit/arm_showroom_spec.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

0
OpenGL/hello/resources/models/nanosuit/body_dif.png → OpenGL/lab3/resources/models/nanosuit/body_dif.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 621 KiB

After

Width:  |  Height:  |  Size: 621 KiB

0
OpenGL/hello/resources/models/nanosuit/body_showroom_ddn.png → OpenGL/lab3/resources/models/nanosuit/body_showroom_ddn.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 840 KiB

After

Width:  |  Height:  |  Size: 840 KiB

0
OpenGL/hello/resources/models/nanosuit/body_showroom_spec.png → OpenGL/lab3/resources/models/nanosuit/body_showroom_spec.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

0
OpenGL/hello/resources/models/nanosuit/glass_ddn.png → OpenGL/lab3/resources/models/nanosuit/glass_ddn.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

0
OpenGL/hello/resources/models/nanosuit/glass_dif.png → OpenGL/lab3/resources/models/nanosuit/glass_dif.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
OpenGL/hello/resources/models/nanosuit/hand_dif.png → OpenGL/lab3/resources/models/nanosuit/hand_dif.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 640 KiB

After

Width:  |  Height:  |  Size: 640 KiB

0
OpenGL/hello/resources/models/nanosuit/hand_showroom_ddn.png → OpenGL/lab3/resources/models/nanosuit/hand_showroom_ddn.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 976 KiB

After

Width:  |  Height:  |  Size: 976 KiB

0
OpenGL/hello/resources/models/nanosuit/hand_showroom_spec.png → OpenGL/lab3/resources/models/nanosuit/hand_showroom_spec.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

0
OpenGL/hello/resources/models/nanosuit/helmet_diff.png → OpenGL/lab3/resources/models/nanosuit/helmet_diff.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 513 KiB

After

Width:  |  Height:  |  Size: 513 KiB

0
OpenGL/hello/resources/models/nanosuit/helmet_showroom_ddn.png → OpenGL/lab3/resources/models/nanosuit/helmet_showroom_ddn.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 729 KiB

After

Width:  |  Height:  |  Size: 729 KiB

0
OpenGL/hello/resources/models/nanosuit/helmet_showroom_spec.png → OpenGL/lab3/resources/models/nanosuit/helmet_showroom_spec.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

0
OpenGL/hello/resources/models/nanosuit/leg_dif.png → OpenGL/lab3/resources/models/nanosuit/leg_dif.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

0
OpenGL/hello/resources/models/nanosuit/leg_showroom_ddn.png → OpenGL/lab3/resources/models/nanosuit/leg_showroom_ddn.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

0
OpenGL/hello/resources/models/nanosuit/leg_showroom_spec.png → OpenGL/lab3/resources/models/nanosuit/leg_showroom_spec.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

0
OpenGL/hello/resources/models/nanosuit/nanosuit.blend → OpenGL/lab3/resources/models/nanosuit/nanosuit.blend
View file

0
OpenGL/hello/resources/models/nanosuit/nanosuit.mtl → OpenGL/lab3/resources/models/nanosuit/nanosuit.mtl
View file

0
OpenGL/hello/resources/models/nanosuit/nanosuit.obj → OpenGL/lab3/resources/models/nanosuit/nanosuit.obj
View file

0
OpenGL/hello/src/glad.cpp → OpenGL/lab3/src/glad.cpp
View file

0
OpenGL/hello/src/main.cpp → OpenGL/lab3/src/main.cpp
View file

0
OpenGL/hello/src/model.fs → OpenGL/lab3/src/model.fs
View file

0
OpenGL/hello/src/model.vs → OpenGL/lab3/src/model.vs
View file

0
OpenGL/hello/src/stb.cpp → OpenGL/lab3/src/stb.cpp
View file

0
OpenGL/hello/src/text.fs → OpenGL/lab3/src/text.fs
View file

0
OpenGL/hello/src/text.vs → OpenGL/lab3/src/text.vs
View file

8
OpenGL/lab4/main.cpp
View file

@ -2,15 +2,10 @@
#include <osgDB/ReadFile>
#include <osgText/Text>
#include <osgGA/TrackballManipulator>
#include <chrono>
#include <osgGA/GUIEventAdapter>
#include <osgViewer/ViewerEventHandlers>
using namespace std;
using namespace chrono;
auto lastFT = system_clock::now();
auto FT = system_clock::now();
int main(int argc, char** argv)
{
@ -30,9 +25,6 @@ int main(int argc, char** argv)
// 启动OSG Viewer循环
while (!viewer.done())
{
auto thisFT = system_clock::now();
auto FT = duration_cast<microseconds>(thisFT - lastFT);
lastFT = thisFT;
viewer.frame();
}

2
SoftwareDesign/Lab2/2-2-1/mainwindow.ui
View file

@ -115,7 +115,7 @@
</rect>
</property>
<property name="text">
<string>***REMOVED*** ***REMOVED***</string>
<string>2020114490 江一和</string>
</property>
</widget>
</widget>

2
SoftwareDesign/Lab5/lab5_1_painter/mainwindow.ui
View file

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>实验5-***REMOVED***-***REMOVED***</string>
<string>实验5-2020114490-江一和</string>
</property>
<widget class="QWidget" name="centralwidget"/>
<widget class="QStatusBar" name="statusbar"/>

2
SoftwareDesign/Lab6/2020114490/mainwindow.ui
View file

@ -45,7 +45,7 @@
<item row="8" column="0" colspan="6">
<widget class="QLabel" name="label_name">
<property name="text">
<string>***REMOVED*** 电子1班 ***REMOVED***</string>
<string>2020114490 电子1班 江一和</string>
</property>
</widget>
</item>