From 3740d114b8afd16c26eced3a6b9baa7d8df5c4f2 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Thu, 22 Sep 2022 19:59:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AC=AC3=E7=AB=A0=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MyOpenGLLearn/.gitignore                                      | 2 ++
 MyOpenGLLearn/.idea/compiler.xml                              | 2 +-
 MyOpenGLLearn/.idea/gradle.xml                                | 2 ++
 MyOpenGLLearn/.idea/misc.xml                                  | 2 +-
 .../app/src/main/java/com/navinfo/myopengllearn/Triangle.java | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/MyOpenGLLearn/.gitignore b/MyOpenGLLearn/.gitignore
index aa724b7..3021787 100644
--- a/MyOpenGLLearn/.gitignore
+++ b/MyOpenGLLearn/.gitignore
@@ -7,9 +7,11 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/*
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+/app/
diff --git a/MyOpenGLLearn/.idea/compiler.xml b/MyOpenGLLearn/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/MyOpenGLLearn/.idea/compiler.xml
+++ b/MyOpenGLLearn/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/MyOpenGLLearn/.idea/gradle.xml b/MyOpenGLLearn/.idea/gradle.xml
index a9f4e52..7b46144 100644
--- a/MyOpenGLLearn/.idea/gradle.xml
+++ b/MyOpenGLLearn/.idea/gradle.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/MyOpenGLLearn/.idea/misc.xml b/MyOpenGLLearn/.idea/misc.xml
index d5d35ec..ef61796 100644
--- a/MyOpenGLLearn/.idea/misc.xml
+++ b/MyOpenGLLearn/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/MyOpenGLLearn/app/src/main/java/com/navinfo/myopengllearn/Triangle.java b/MyOpenGLLearn/app/src/main/java/com/navinfo/myopengllearn/Triangle.java
index 03ce2a4..09bd1b9 100644
--- a/MyOpenGLLearn/app/src/main/java/com/navinfo/myopengllearn/Triangle.java
+++ b/MyOpenGLLearn/app/src/main/java/com/navinfo/myopengllearn/Triangle.java
@@ -69,9 +69,9 @@ public class Triangle
     public void initShader(MyTDView mv)
     {
         //加载顶点着色器的脚本内容
-        mVertexShader=ShaderUtil.loadFromAssetsFile("vertex.sh", mv.getResources());
+        mVertexShader=ShaderUtil.loadFromAssetsFile("vertex.glsl", mv.getResources());
         //加载片元着色器的脚本内容
-        mFragmentShader=ShaderUtil.loadFromAssetsFile("frag.sh", mv.getResources());
+        mFragmentShader=ShaderUtil.loadFromAssetsFile("frag.glsl", mv.getResources());
         //基于顶点着色器与片元着色器创建程序
         mProgram = ShaderUtil.createProgram(mVertexShader, mFragmentShader);
         //获取程序中顶点位置属性引用id