diff --git a/AIandML/e1_python_basics/e1.0_python.ipynb b/AIandML/e1_python_basics/e1.0_python.ipynb index a977b4f..958aef3 100644 --- a/AIandML/e1_python_basics/e1.0_python.ipynb +++ b/AIandML/e1_python_basics/e1.0_python.ipynb @@ -10,7 +10,7 @@ "\n", "|学号 |姓名 |\n", "|----------|--------|\n", - "|***REMOVED***|***REMOVED***|\n", + "|2020114490|江一和|\n", "|2020113874|何一涛|" ] }, diff --git a/AIandML/e1_python_basics/e1.1_numpy.ipynb b/AIandML/e1_python_basics/e1.1_numpy.ipynb index 954860f..8874b80 100644 --- a/AIandML/e1_python_basics/e1.1_numpy.ipynb +++ b/AIandML/e1_python_basics/e1.1_numpy.ipynb @@ -10,7 +10,7 @@ "\n", "|学号 |姓名 |\n", "|----------|--------|\n", - "|***REMOVED***|***REMOVED***|\n", + "|2020114490|江一和|\n", "|2020113874|何一涛|" ] }, diff --git a/AIandML/e1_python_basics/e1.2_matplotlib.ipynb b/AIandML/e1_python_basics/e1.2_matplotlib.ipynb index 3dca26a..10cfb4e 100644 --- a/AIandML/e1_python_basics/e1.2_matplotlib.ipynb +++ b/AIandML/e1_python_basics/e1.2_matplotlib.ipynb @@ -15,7 +15,7 @@ "\n", "|学号 |姓名 |\n", "|----------|--------|\n", - "|***REMOVED***|***REMOVED***|\n", + "|2020114490|江一和|\n", "|2020113874|何一涛|" ] }, diff --git a/AIandML/e1_python_basics/e1.3_pandas.ipynb b/AIandML/e1_python_basics/e1.3_pandas.ipynb index 8e23686..9a46ce3 100644 --- a/AIandML/e1_python_basics/e1.3_pandas.ipynb +++ b/AIandML/e1_python_basics/e1.3_pandas.ipynb @@ -9,7 +9,7 @@ "\n", "|学号 |姓名 |\n", "|----------|--------|\n", - "|***REMOVED***|***REMOVED***|\n", + "|2020114490|江一和|\n", "|2020113874|何一涛|\n", "\n", "本部分的实验,需要自己在网络学习相关基础函数使用。" diff --git a/CN/IP1.pcapng b/CN/IP1.pcapng new file mode 100644 index 0000000..a9ebfd6 Binary files /dev/null and b/CN/IP1.pcapng differ diff --git a/OpenGL/hello/Makefile b/OpenGL/lab3/Makefile similarity index 100% rename from OpenGL/hello/Makefile rename to OpenGL/lab3/Makefile diff --git a/OpenGL/hello/include/KHR/khrplatform.h b/OpenGL/lab3/include/KHR/khrplatform.h similarity index 100% rename from OpenGL/hello/include/KHR/khrplatform.h rename to OpenGL/lab3/include/KHR/khrplatform.h diff --git a/OpenGL/hello/include/camera.h b/OpenGL/lab3/include/camera.h similarity index 100% rename from OpenGL/hello/include/camera.h rename to OpenGL/lab3/include/camera.h diff --git a/OpenGL/hello/include/glad/glad.h b/OpenGL/lab3/include/glad/glad.h similarity index 100% rename from OpenGL/hello/include/glad/glad.h rename to OpenGL/lab3/include/glad/glad.h diff --git a/OpenGL/hello/include/mesh.h b/OpenGL/lab3/include/mesh.h similarity index 100% rename from OpenGL/hello/include/mesh.h rename to OpenGL/lab3/include/mesh.h diff --git a/OpenGL/hello/include/model.h b/OpenGL/lab3/include/model.h similarity index 100% rename from OpenGL/hello/include/model.h rename to OpenGL/lab3/include/model.h diff --git a/OpenGL/hello/include/shader.h b/OpenGL/lab3/include/shader.h similarity index 100% rename from OpenGL/hello/include/shader.h rename to OpenGL/lab3/include/shader.h diff --git a/OpenGL/hello/include/source.h b/OpenGL/lab3/include/source.h similarity index 100% rename from OpenGL/hello/include/source.h rename to OpenGL/lab3/include/source.h diff --git a/OpenGL/hello/include/stb_image.h b/OpenGL/lab3/include/stb_image.h similarity index 100% rename from OpenGL/hello/include/stb_image.h rename to OpenGL/lab3/include/stb_image.h diff --git a/OpenGL/hello/resources/awesomeface.png b/OpenGL/lab3/resources/awesomeface.png similarity index 100% rename from OpenGL/hello/resources/awesomeface.png rename to OpenGL/lab3/resources/awesomeface.png diff --git a/OpenGL/hello/resources/container.jpg b/OpenGL/lab3/resources/container.jpg similarity index 100% rename from OpenGL/hello/resources/container.jpg rename to OpenGL/lab3/resources/container.jpg diff --git a/OpenGL/hello/resources/models/clock/BGE_Clock.blend b/OpenGL/lab3/resources/models/clock/BGE_Clock.blend similarity index 100% rename from OpenGL/hello/resources/models/clock/BGE_Clock.blend rename to OpenGL/lab3/resources/models/clock/BGE_Clock.blend diff --git a/OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (1).jpg b/OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (1).jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (1).jpg rename to OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (1).jpg diff --git a/OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (2).jpg b/OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (2).jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (2).jpg rename to OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (2).jpg diff --git a/OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (3).jpg b/OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (3).jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (3).jpg rename to OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (3).jpg diff --git a/OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (4).jpg b/OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (4).jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (4).jpg rename to OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (4).jpg diff --git a/OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (5).jpg b/OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (5).jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (5).jpg rename to OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (5).jpg diff --git a/OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (6).jpg b/OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (6).jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock BGE Cycles or with Constraints (6).jpg rename to OpenGL/lab3/resources/models/clock/Clock BGE Cycles or with Constraints (6).jpg diff --git a/OpenGL/hello/resources/models/clock/Clock_3ds.3ds b/OpenGL/lab3/resources/models/clock/Clock_3ds.3ds similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock_3ds.3ds rename to OpenGL/lab3/resources/models/clock/Clock_3ds.3ds diff --git a/OpenGL/hello/resources/models/clock/Clock_dae.dae b/OpenGL/lab3/resources/models/clock/Clock_dae.dae similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock_dae.dae rename to OpenGL/lab3/resources/models/clock/Clock_dae.dae diff --git a/OpenGL/hello/resources/models/clock/Clock_fbx.fbx b/OpenGL/lab3/resources/models/clock/Clock_fbx.fbx similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock_fbx.fbx rename to OpenGL/lab3/resources/models/clock/Clock_fbx.fbx diff --git a/OpenGL/hello/resources/models/clock/Clock_for_CYCLES.blend b/OpenGL/lab3/resources/models/clock/Clock_for_CYCLES.blend similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock_for_CYCLES.blend rename to OpenGL/lab3/resources/models/clock/Clock_for_CYCLES.blend diff --git a/OpenGL/hello/resources/models/clock/Clock_obj.mtl b/OpenGL/lab3/resources/models/clock/Clock_obj.mtl similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock_obj.mtl rename to OpenGL/lab3/resources/models/clock/Clock_obj.mtl diff --git a/OpenGL/hello/resources/models/clock/Clock_obj.obj b/OpenGL/lab3/resources/models/clock/Clock_obj.obj similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock_obj.obj rename to OpenGL/lab3/resources/models/clock/Clock_obj.obj diff --git a/OpenGL/hello/resources/models/clock/Clock_x3d.x3d b/OpenGL/lab3/resources/models/clock/Clock_x3d.x3d similarity index 100% rename from OpenGL/hello/resources/models/clock/Clock_x3d.x3d rename to OpenGL/lab3/resources/models/clock/Clock_x3d.x3d diff --git a/OpenGL/hello/resources/models/clock/Constrain_Clock.blend b/OpenGL/lab3/resources/models/clock/Constrain_Clock.blend similarity index 100% rename from OpenGL/hello/resources/models/clock/Constrain_Clock.blend rename to OpenGL/lab3/resources/models/clock/Constrain_Clock.blend diff --git a/OpenGL/hello/resources/models/clock/Constrain_Clock.blend1 b/OpenGL/lab3/resources/models/clock/Constrain_Clock.blend1 similarity index 100% rename from OpenGL/hello/resources/models/clock/Constrain_Clock.blend1 rename to OpenGL/lab3/resources/models/clock/Constrain_Clock.blend1 diff --git a/OpenGL/hello/resources/models/clock/Readme.txt b/OpenGL/lab3/resources/models/clock/Readme.txt similarity index 100% rename from OpenGL/hello/resources/models/clock/Readme.txt rename to OpenGL/lab3/resources/models/clock/Readme.txt diff --git a/OpenGL/hello/resources/models/clock/textures/Black.jpg b/OpenGL/lab3/resources/models/clock/textures/Black.jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/textures/Black.jpg rename to OpenGL/lab3/resources/models/clock/textures/Black.jpg diff --git a/OpenGL/hello/resources/models/clock/textures/Black_nor.jpg b/OpenGL/lab3/resources/models/clock/textures/Black_nor.jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/textures/Black_nor.jpg rename to OpenGL/lab3/resources/models/clock/textures/Black_nor.jpg diff --git a/OpenGL/hello/resources/models/clock/textures/Ref.jpg b/OpenGL/lab3/resources/models/clock/textures/Ref.jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/textures/Ref.jpg rename to OpenGL/lab3/resources/models/clock/textures/Ref.jpg diff --git a/OpenGL/hello/resources/models/clock/textures/Uhr_ohne_Zeiger.jpg b/OpenGL/lab3/resources/models/clock/textures/Uhr_ohne_Zeiger.jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/textures/Uhr_ohne_Zeiger.jpg rename to OpenGL/lab3/resources/models/clock/textures/Uhr_ohne_Zeiger.jpg diff --git a/OpenGL/hello/resources/models/clock/textures/steel.jpg b/OpenGL/lab3/resources/models/clock/textures/steel.jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/textures/steel.jpg rename to OpenGL/lab3/resources/models/clock/textures/steel.jpg diff --git a/OpenGL/hello/resources/models/clock/textures/steel_nor.jpg b/OpenGL/lab3/resources/models/clock/textures/steel_nor.jpg similarity index 100% rename from OpenGL/hello/resources/models/clock/textures/steel_nor.jpg rename to OpenGL/lab3/resources/models/clock/textures/steel_nor.jpg diff --git a/OpenGL/hello/resources/models/nanosuit/LICENSE.txt b/OpenGL/lab3/resources/models/nanosuit/LICENSE.txt similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/LICENSE.txt rename to OpenGL/lab3/resources/models/nanosuit/LICENSE.txt diff --git a/OpenGL/hello/resources/models/nanosuit/arm_dif.png b/OpenGL/lab3/resources/models/nanosuit/arm_dif.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/arm_dif.png rename to OpenGL/lab3/resources/models/nanosuit/arm_dif.png diff --git a/OpenGL/hello/resources/models/nanosuit/arm_showroom_ddn.png b/OpenGL/lab3/resources/models/nanosuit/arm_showroom_ddn.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/arm_showroom_ddn.png rename to OpenGL/lab3/resources/models/nanosuit/arm_showroom_ddn.png diff --git a/OpenGL/hello/resources/models/nanosuit/arm_showroom_spec.png b/OpenGL/lab3/resources/models/nanosuit/arm_showroom_spec.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/arm_showroom_spec.png rename to OpenGL/lab3/resources/models/nanosuit/arm_showroom_spec.png diff --git a/OpenGL/hello/resources/models/nanosuit/body_dif.png b/OpenGL/lab3/resources/models/nanosuit/body_dif.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/body_dif.png rename to OpenGL/lab3/resources/models/nanosuit/body_dif.png diff --git a/OpenGL/hello/resources/models/nanosuit/body_showroom_ddn.png b/OpenGL/lab3/resources/models/nanosuit/body_showroom_ddn.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/body_showroom_ddn.png rename to OpenGL/lab3/resources/models/nanosuit/body_showroom_ddn.png diff --git a/OpenGL/hello/resources/models/nanosuit/body_showroom_spec.png b/OpenGL/lab3/resources/models/nanosuit/body_showroom_spec.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/body_showroom_spec.png rename to OpenGL/lab3/resources/models/nanosuit/body_showroom_spec.png diff --git a/OpenGL/hello/resources/models/nanosuit/glass_ddn.png b/OpenGL/lab3/resources/models/nanosuit/glass_ddn.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/glass_ddn.png rename to OpenGL/lab3/resources/models/nanosuit/glass_ddn.png diff --git a/OpenGL/hello/resources/models/nanosuit/glass_dif.png b/OpenGL/lab3/resources/models/nanosuit/glass_dif.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/glass_dif.png rename to OpenGL/lab3/resources/models/nanosuit/glass_dif.png diff --git a/OpenGL/hello/resources/models/nanosuit/hand_dif.png b/OpenGL/lab3/resources/models/nanosuit/hand_dif.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/hand_dif.png rename to OpenGL/lab3/resources/models/nanosuit/hand_dif.png diff --git a/OpenGL/hello/resources/models/nanosuit/hand_showroom_ddn.png b/OpenGL/lab3/resources/models/nanosuit/hand_showroom_ddn.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/hand_showroom_ddn.png rename to OpenGL/lab3/resources/models/nanosuit/hand_showroom_ddn.png diff --git a/OpenGL/hello/resources/models/nanosuit/hand_showroom_spec.png b/OpenGL/lab3/resources/models/nanosuit/hand_showroom_spec.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/hand_showroom_spec.png rename to OpenGL/lab3/resources/models/nanosuit/hand_showroom_spec.png diff --git a/OpenGL/hello/resources/models/nanosuit/helmet_diff.png b/OpenGL/lab3/resources/models/nanosuit/helmet_diff.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/helmet_diff.png rename to OpenGL/lab3/resources/models/nanosuit/helmet_diff.png diff --git a/OpenGL/hello/resources/models/nanosuit/helmet_showroom_ddn.png b/OpenGL/lab3/resources/models/nanosuit/helmet_showroom_ddn.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/helmet_showroom_ddn.png rename to OpenGL/lab3/resources/models/nanosuit/helmet_showroom_ddn.png diff --git a/OpenGL/hello/resources/models/nanosuit/helmet_showroom_spec.png b/OpenGL/lab3/resources/models/nanosuit/helmet_showroom_spec.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/helmet_showroom_spec.png rename to OpenGL/lab3/resources/models/nanosuit/helmet_showroom_spec.png diff --git a/OpenGL/hello/resources/models/nanosuit/leg_dif.png b/OpenGL/lab3/resources/models/nanosuit/leg_dif.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/leg_dif.png rename to OpenGL/lab3/resources/models/nanosuit/leg_dif.png diff --git a/OpenGL/hello/resources/models/nanosuit/leg_showroom_ddn.png b/OpenGL/lab3/resources/models/nanosuit/leg_showroom_ddn.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/leg_showroom_ddn.png rename to OpenGL/lab3/resources/models/nanosuit/leg_showroom_ddn.png diff --git a/OpenGL/hello/resources/models/nanosuit/leg_showroom_spec.png b/OpenGL/lab3/resources/models/nanosuit/leg_showroom_spec.png similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/leg_showroom_spec.png rename to OpenGL/lab3/resources/models/nanosuit/leg_showroom_spec.png diff --git a/OpenGL/hello/resources/models/nanosuit/nanosuit.blend b/OpenGL/lab3/resources/models/nanosuit/nanosuit.blend similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/nanosuit.blend rename to OpenGL/lab3/resources/models/nanosuit/nanosuit.blend diff --git a/OpenGL/hello/resources/models/nanosuit/nanosuit.mtl b/OpenGL/lab3/resources/models/nanosuit/nanosuit.mtl similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/nanosuit.mtl rename to OpenGL/lab3/resources/models/nanosuit/nanosuit.mtl diff --git a/OpenGL/hello/resources/models/nanosuit/nanosuit.obj b/OpenGL/lab3/resources/models/nanosuit/nanosuit.obj similarity index 100% rename from OpenGL/hello/resources/models/nanosuit/nanosuit.obj rename to OpenGL/lab3/resources/models/nanosuit/nanosuit.obj diff --git a/OpenGL/hello/src/glad.cpp b/OpenGL/lab3/src/glad.cpp similarity index 100% rename from OpenGL/hello/src/glad.cpp rename to OpenGL/lab3/src/glad.cpp diff --git a/OpenGL/hello/src/main.cpp b/OpenGL/lab3/src/main.cpp similarity index 100% rename from OpenGL/hello/src/main.cpp rename to OpenGL/lab3/src/main.cpp diff --git a/OpenGL/hello/src/model.fs b/OpenGL/lab3/src/model.fs similarity index 100% rename from OpenGL/hello/src/model.fs rename to OpenGL/lab3/src/model.fs diff --git a/OpenGL/hello/src/model.vs b/OpenGL/lab3/src/model.vs similarity index 100% rename from OpenGL/hello/src/model.vs rename to OpenGL/lab3/src/model.vs diff --git a/OpenGL/hello/src/stb.cpp b/OpenGL/lab3/src/stb.cpp similarity index 100% rename from OpenGL/hello/src/stb.cpp rename to OpenGL/lab3/src/stb.cpp diff --git a/OpenGL/hello/src/text.fs b/OpenGL/lab3/src/text.fs similarity index 100% rename from OpenGL/hello/src/text.fs rename to OpenGL/lab3/src/text.fs diff --git a/OpenGL/hello/src/text.vs b/OpenGL/lab3/src/text.vs similarity index 100% rename from OpenGL/hello/src/text.vs rename to OpenGL/lab3/src/text.vs diff --git a/OpenGL/lab4/main.cpp b/OpenGL/lab4/main.cpp index a61c2f3..2673ad6 100644 --- a/OpenGL/lab4/main.cpp +++ b/OpenGL/lab4/main.cpp @@ -2,15 +2,10 @@ #include #include #include -#include #include #include 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(thisFT - lastFT); - lastFT = thisFT; viewer.frame(); } diff --git a/SoftwareDesign/Lab2/2-2-1/mainwindow.ui b/SoftwareDesign/Lab2/2-2-1/mainwindow.ui index 8c90bf1..cd3f2bc 100644 --- a/SoftwareDesign/Lab2/2-2-1/mainwindow.ui +++ b/SoftwareDesign/Lab2/2-2-1/mainwindow.ui @@ -115,7 +115,7 @@ - ***REMOVED*** ***REMOVED*** + 2020114490 江一和 diff --git a/SoftwareDesign/Lab5/lab5_1_painter/mainwindow.ui b/SoftwareDesign/Lab5/lab5_1_painter/mainwindow.ui index d7c0faf..b1f51c6 100644 --- a/SoftwareDesign/Lab5/lab5_1_painter/mainwindow.ui +++ b/SoftwareDesign/Lab5/lab5_1_painter/mainwindow.ui @@ -11,7 +11,7 @@ - 实验5-***REMOVED***-***REMOVED*** + 实验5-2020114490-江一和 diff --git a/SoftwareDesign/Lab6/2020114490/mainwindow.ui b/SoftwareDesign/Lab6/2020114490/mainwindow.ui index 02845e6..e141855 100644 --- a/SoftwareDesign/Lab6/2020114490/mainwindow.ui +++ b/SoftwareDesign/Lab6/2020114490/mainwindow.ui @@ -45,7 +45,7 @@ - ***REMOVED*** 电子1班 ***REMOVED*** + 2020114490 电子1班 江一和