Browse Source

Try to fix some bugs

Panagiotis Christopoulos Charitos 4 năm trước cách đây
mục cha
commit
b2d11002bf

+ 1 - 1
AnKi/Shaders/LightFunctions.glsl

@@ -87,7 +87,7 @@ ANKI_RP Vec3 F_Schlick(ANKI_RP Vec3 f0, ANKI_RP F32 VoH)
 // D(n,h) aka NDF: GGX Trowbridge-Reitz
 // D(n,h) aka NDF: GGX Trowbridge-Reitz
 ANKI_RP F32 D_GGX(ANKI_RP F32 roughness, ANKI_RP F32 NoH, ANKI_RP Vec3 h, ANKI_RP Vec3 worldNormal)
 ANKI_RP F32 D_GGX(ANKI_RP F32 roughness, ANKI_RP F32 NoH, ANKI_RP Vec3 h, ANKI_RP Vec3 worldNormal)
 {
 {
-#if ANKI_OS_ANDROID
+#if 0 && ANKI_OS_ANDROID
 	const ANKI_RP Vec3 NxH = cross(worldNormal, h);
 	const ANKI_RP Vec3 NxH = cross(worldNormal, h);
 	const ANKI_RP F32 oneMinusNoHSquared = dot(NxH, NxH);
 	const ANKI_RP F32 oneMinusNoHSquared = dot(NxH, NxH);
 #else
 #else

+ 1 - 1
Tools/Android/app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 
 
 android {
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     ndkVersion "23.0.7599858"
     ndkVersion "23.0.7599858"
     defaultConfig {
     defaultConfig {
         applicationId "org.anki.%TARGET%"
         applicationId "org.anki.%TARGET%"

+ 1 - 1
Tools/Android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
         jcenter()
     }
     }
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         // in the individual module build.gradle files